Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a8ef0a93 Drop remove leaked chunk patch - causing many issues
ff4ca31f Fix premature unloading of neighbor chunks for world gen
fde81356 Fix Chunks unloading immediately for priority access - Fixes #3461
9980f427 Fix some logic on villager poi max attempts
919ab67a Fix concurrency issue in light engine (Vanilla bug)
0d5ec653 Cleanup async chunks (#3456)
c3c005c9 Updated Upstream (Bukkit/CraftBukkit) (Fixes #3443)
This commit is contained in:
William Blake Galbreath
2020-05-29 17:42:32 -05:00
parent a2b3b33061
commit a032d548bf
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: b0b54e4ef3...a8ef0a93b9

2
current-paper
View File

@@ -1 +1 @@
1.15.2--3b0e4b2f45a0c069c407b56f24d9f04b5cad032a 1.15.2--f3c7076de22e62cc37044558163e341613072819

6
patches/api/0030-Add-ItemStack-convenience-methods.patch
View File

@@ -1,4 +1,4 @@
From c7218d4100f7de38fbfc643e4705908adf1c41bd Mon Sep 17 00:00:00 2001 From da8df9256caea27c4fc9e9298878e1d1428fe6a1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 15 Mar 2020 20:52:12 -0500 Date: Sun, 15 Mar 2020 20:52:12 -0500
Subject: [PATCH] Add ItemStack convenience methods Subject: [PATCH] Add ItemStack convenience methods
@@ -9,10 +9,10 @@ Subject: [PATCH] Add ItemStack convenience methods
2 files changed, 651 insertions(+) 2 files changed, 651 insertions(+)
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 1f2dbd68c..f2be0d0ce 100644 index b89fc2dc0..d5cf01dae 100644
--- a/src/main/java/org/bukkit/Material.java --- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java
@@ -7995,4 +7995,36 @@ public enum Material implements Keyed { @@ -8021,4 +8021,36 @@ public enum Material implements Keyed {
// </editor-fold> // </editor-fold>
} }
} }

8
patches/server/0103-Optimize-Chunk-Ticks.patch
View File

@@ -1,4 +1,4 @@
From a75f52ba9053f7276ad8e6a950381c9c2e35f7d8 Mon Sep 17 00:00:00 2001 From a86a2da2c5932ea73094f9e8612250867ae7b89c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Apr 2020 00:28:06 -0500 Date: Thu, 2 Apr 2020 00:28:06 -0500
Subject: [PATCH] Optimize Chunk Ticks Subject: [PATCH] Optimize Chunk Ticks
@@ -9,10 +9,10 @@ Subject: [PATCH] Optimize Chunk Ticks
2 files changed, 25 insertions(+), 39 deletions(-) 2 files changed, 25 insertions(+), 39 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 1209fbf1c9..0ebd2f8799 100644 index 54e89c9cc6..9af2c5c747 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -782,11 +782,12 @@ public class ChunkProviderServer extends IChunkProvider { @@ -781,11 +781,12 @@ public class ChunkProviderServer extends IChunkProvider {
int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED); int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED);
BlockPosition blockposition = this.world.getSpawn(); BlockPosition blockposition = this.world.getSpawn();
// CraftBukkit start - Other mob type spawn tick rate // CraftBukkit start - Other mob type spawn tick rate
@@ -30,7 +30,7 @@ index 1209fbf1c9..0ebd2f8799 100644
// CraftBukkit end // CraftBukkit end
this.world.getMethodProfiler().enter("naturalSpawnCount"); this.world.getMethodProfiler().enter("naturalSpawnCount");
@@ -833,40 +834,11 @@ public class ChunkProviderServer extends IChunkProvider { @@ -831,40 +832,11 @@ public class ChunkProviderServer extends IChunkProvider {
if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(playerchunk, chunkcoordintpair, true)) { // Spigot // Paper - optimise isOutsideOfRange if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(playerchunk, chunkcoordintpair, true)) { // Spigot // Paper - optimise isOutsideOfRange
this.world.getMethodProfiler().enter("spawner"); this.world.getMethodProfiler().enter("spawner");
this.world.timings.mobSpawn.startTiming(); // Spigot this.world.timings.mobSpawn.startTiming(); // Spigot

16
patches/server/0122-Tuinity-Delay-chunk-unloads.patch
View File

@@ -1,4 +1,4 @@
From d2c2b464f6e94a3c3904e410164da9c97e9dde84 Mon Sep 17 00:00:00 2001 From 0676e1e882ad34b6ea8cd6fc7455919c2d34ccc9 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com> From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 25 Oct 2019 02:11:30 -0700 Date: Fri, 25 Oct 2019 02:11:30 -0700
Subject: [PATCH] Tuinity - Delay chunk unloads Subject: [PATCH] Tuinity - Delay chunk unloads
@@ -23,7 +23,7 @@ Configurable under `delay-chunkunloads-by` in config.
6 files changed, 82 insertions(+), 4 deletions(-) 6 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
index 55f9f4e6e..ac21fdb4c 100644 index 55f9f4e6e7..ac21fdb4c9 100644
--- a/src/main/java/net/minecraft/server/ChunkMap.java --- a/src/main/java/net/minecraft/server/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/ChunkMap.java +++ b/src/main/java/net/minecraft/server/ChunkMap.java
@@ -68,6 +68,7 @@ public abstract class ChunkMap extends LightEngineGraph { @@ -68,6 +68,7 @@ public abstract class ChunkMap extends LightEngineGraph {
@@ -35,7 +35,7 @@ index 55f9f4e6e..ac21fdb4c 100644
this.a(ChunkCoordIntPair.a, i, j, flag); this.a(ChunkCoordIntPair.a, i, j, flag);
} }
diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
index 771d87971..6d46ca591 100644 index 9805361e2d..3ad0177d2a 100644
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -31,7 +31,7 @@ public abstract class ChunkMapDistance { @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance {
@@ -134,7 +134,7 @@ index 771d87971..6d46ca591 100644
private static int a(ArraySetSorted<Ticket<?>> arraysetsorted) { private static int a(ArraySetSorted<Ticket<?>> arraysetsorted) {
AsyncCatcher.catchOp("ChunkMapDistance::getHighestTicketLevel"); // Paper AsyncCatcher.catchOp("ChunkMapDistance::getHighestTicketLevel"); // Paper
return !arraysetsorted.isEmpty() ? ((Ticket) arraysetsorted.b()).b() : PlayerChunkMap.GOLDEN_TICKET + 1; return !arraysetsorted.isEmpty() ? ((Ticket) arraysetsorted.b()).b() : PlayerChunkMap.GOLDEN_TICKET + 1;
@@ -175,6 +234,11 @@ public abstract class ChunkMapDistance { @@ -182,6 +241,11 @@ public abstract class ChunkMapDistance {
boolean removed = false; // CraftBukkit boolean removed = false; // CraftBukkit
if (arraysetsorted.remove(ticket)) { if (arraysetsorted.remove(ticket)) {
removed = true; // CraftBukkit removed = true; // CraftBukkit
@@ -147,7 +147,7 @@ index 771d87971..6d46ca591 100644
if (arraysetsorted.isEmpty()) { if (arraysetsorted.isEmpty()) {
diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java
index 0d6e0f2dd..ce0aef25c 100644 index 0d6e0f2dda..ce0aef25c6 100644
--- a/src/main/java/net/minecraft/server/Ticket.java --- a/src/main/java/net/minecraft/server/Ticket.java
+++ b/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java
@@ -5,9 +5,10 @@ import java.util.Objects; @@ -5,9 +5,10 @@ import java.util.Objects;
@@ -172,7 +172,7 @@ index 0d6e0f2dd..ce0aef25c 100644
long j = this.a.b(); long j = this.a.b();
diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
index 24ec5d77c..1243134bc 100644 index 24ec5d77ca..1243134bc2 100644
--- a/src/main/java/net/minecraft/server/TicketType.java --- a/src/main/java/net/minecraft/server/TicketType.java
+++ b/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java
@@ -25,6 +25,7 @@ public class TicketType<T> { @@ -25,6 +25,7 @@ public class TicketType<T> {
@@ -184,7 +184,7 @@ index 24ec5d77c..1243134bc 100644
public static <T> TicketType<T> a(String s, Comparator<T> comparator) { public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
return new TicketType<>(s, comparator, 0L); return new TicketType<>(s, comparator, 0L);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index ab88636ca..becb13e0e 100644 index ab88636cad..becb13e0e0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -4,6 +4,7 @@ import com.google.common.base.Throwables; @@ -4,6 +4,7 @@ import com.google.common.base.Throwables;
@@ -209,7 +209,7 @@ index ab88636ca..becb13e0e 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 066b07f5a..067272cf3 100644 index cc1fb7108a..159c7673d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -488,6 +488,7 @@ public class CraftWorld implements World { @@ -488,6 +488,7 @@ public class CraftWorld implements World {