From 87eeb0335480e1663faca91f58113d3e3f9cf4db Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 15 Aug 2019 12:55:24 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: c4ae0002 Fix some API and commands usage of inactive chunks (#2457) 700a6649 Print entity debug stacktrace on entity double add (#2438) 9d6680ee Fix MC-158900 (#2458) 928abb41 [CI-SKIP] Rebuild patches for last merge 34e64781 Do less work if we have a custom Bukkit generator (#2318) --- Paper | 2 +- current-paper | 2 +- ...51-Asynchronous-chunk-IO-and-loading.patch | 12 +++++----- ...ement-optional-per-player-mob-spawns.patch | 12 +++++----- ...e-permissions-for-players-on-world-c.patch | 12 +++++----- patches/server/0058-Advancement-stuffs.patch | 24 +++++++++++++++++++ 6 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 patches/server/0058-Advancement-stuffs.patch diff --git a/Paper b/Paper index cdd0bb437..c4ae0002e 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit cdd0bb43763323d96ce44394a94409929fa553b9 +Subproject commit c4ae0002e1557ee4f73bc9c1cecee7110d652818 diff --git a/current-paper b/current-paper index 6a40edf0a..bd84005b0 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.4--9a331db94dcd70a7f484a1af9896e74d0de44e08 +1.14.4--3a747505b7af504d2e80e836bf8f1cfe810411c7 diff --git a/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch index fa9720b57..da9301977 100644 --- a/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch +++ b/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From d5e9cc74d18901973803a30ca23e71253fcf0960 Mon Sep 17 00:00:00 2001 +From 244cc8e22e8c2ad480abd369e3bcc041af550c28 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -3602,7 +3602,7 @@ index b0e6ad773..f6c95ae8c 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e73257f3f..787dc3e88 100644 +index 2969fcd55..0e23eeb1f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,9 +1,9 @@ @@ -3706,10 +3706,10 @@ index e73257f3f..787dc3e88 100644 public void doTick(BooleanSupplier booleansupplier) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 21f153013..7fe8a5988 100644 +index 78e018caa..b8b1bf98c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -538,22 +538,23 @@ public class CraftWorld implements World { +@@ -551,22 +551,23 @@ public class CraftWorld implements World { return true; } @@ -3741,7 +3741,7 @@ index 21f153013..7fe8a5988 100644 // fall through to load // we do this so we do not re-read the chunk data on disk -@@ -2336,16 +2337,17 @@ public class CraftWorld implements World { +@@ -2349,16 +2350,17 @@ public class CraftWorld implements World { @Override public CompletableFuture getChunkAtAsync(int x, int z, boolean gen) { @@ -3769,5 +3769,5 @@ index 21f153013..7fe8a5988 100644 // Paper end -- -2.20.1 +2.23.0.rc1 diff --git a/patches/server/0054-implement-optional-per-player-mob-spawns.patch b/patches/server/0054-implement-optional-per-player-mob-spawns.patch index 70b2d4e0a..1708cfc94 100644 --- a/patches/server/0054-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0054-implement-optional-per-player-mob-spawns.patch @@ -1,4 +1,4 @@ -From 88eefa693e3cd107d509050841e1a2d478e9b837 Mon Sep 17 00:00:00 2001 +From a588cde615cc358ee14a68296bd46ff6d278deed Mon Sep 17 00:00:00 2001 From: kickash32 Date: Tue, 11 Jun 2019 22:22:16 -0400 Subject: [PATCH] implement optional per player mob spawns @@ -225,7 +225,7 @@ index 62fc61df2..b2a1999bb 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 787dc3e88..50fcab233 100644 +index 0e23eeb1f..0bbd28ed8 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -70,6 +70,7 @@ public class WorldServer extends World { @@ -236,7 +236,7 @@ index 787dc3e88..50fcab233 100644 // CraftBukkit start private int tickPosition; -@@ -964,6 +965,16 @@ public class WorldServer extends World { +@@ -966,6 +967,16 @@ public class WorldServer extends World { } public Object2IntMap l() { @@ -253,7 +253,7 @@ index 787dc3e88..50fcab233 100644 Object2IntMap object2intmap = new Object2IntOpenHashMap(); ObjectIterator objectiterator = this.entitiesById.values().iterator(); -@@ -988,6 +999,7 @@ public class WorldServer extends World { +@@ -990,6 +1001,7 @@ public class WorldServer extends World { entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) { continue; } @@ -261,7 +261,7 @@ index 787dc3e88..50fcab233 100644 // Paper end object2intmap.mergeInt(enumcreaturetype, 1, Integer::sum); } -@@ -996,6 +1008,20 @@ public class WorldServer extends World { +@@ -998,6 +1010,20 @@ public class WorldServer extends World { return object2intmap; } @@ -283,5 +283,5 @@ index 787dc3e88..50fcab233 100644 public boolean addEntity(Entity entity) { // CraftBukkit start -- -2.20.1 +2.23.0.rc1 diff --git a/patches/server/0055-Don-t-recalculate-permissions-for-players-on-world-c.patch b/patches/server/0055-Don-t-recalculate-permissions-for-players-on-world-c.patch index 3c858bddc..92f9d1320 100644 --- a/patches/server/0055-Don-t-recalculate-permissions-for-players-on-world-c.patch +++ b/patches/server/0055-Don-t-recalculate-permissions-for-players-on-world-c.patch @@ -1,4 +1,4 @@ -From 02b283ebcb6564ec20c53360f7ef49a7e5077e5f Mon Sep 17 00:00:00 2001 +From 95f61700633ff04a5734635b9a5299526728d2ee Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 12 Jul 2019 07:59:35 -0500 Subject: [PATCH] Don't recalculate permissions for players on world change @@ -9,10 +9,10 @@ Subject: [PATCH] Don't recalculate permissions for players on world change 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a183bb45..11ba67d5 100644 +index 3cb443c4f..a33285379 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -709,7 +709,7 @@ public abstract class PlayerList { +@@ -711,7 +711,7 @@ public abstract class PlayerList { entityplayer1.playerConnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked())); entityplayer1.playerConnection.sendPacket(new PacketPlayOutExperience(entityplayer1.exp, entityplayer1.expTotal, entityplayer1.expLevel)); this.a(entityplayer1, worldserver); @@ -21,7 +21,7 @@ index a183bb45..11ba67d5 100644 if (!entityplayer.playerConnection.isDisconnected()) { worldserver.addPlayerRespawn(entityplayer1); this.players.add(entityplayer1); -@@ -750,6 +750,7 @@ public abstract class PlayerList { +@@ -752,6 +752,7 @@ public abstract class PlayerList { return entityplayer1; } @@ -30,7 +30,7 @@ index a183bb45..11ba67d5 100644 GameProfile gameprofile = entityplayer.getProfile(); int i = this.server.a(gameprofile); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 01c9d086..20231143 100644 +index 01c9d0861..20231143e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -166,6 +166,11 @@ public class PurpurConfig { @@ -46,5 +46,5 @@ index 01c9d086..20231143 100644 private static void requireShiftToMount() { requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount); -- -2.20.1 +2.23.0.rc1 diff --git a/patches/server/0058-Advancement-stuffs.patch b/patches/server/0058-Advancement-stuffs.patch new file mode 100644 index 000000000..955973c30 --- /dev/null +++ b/patches/server/0058-Advancement-stuffs.patch @@ -0,0 +1,24 @@ +From 89cb55714c89430c7675fc909da2c0ebf0b07c87 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sun, 11 Aug 2019 22:25:33 -0500 +Subject: [PATCH] Advancement stuffs + +--- + src/main/java/net/minecraft/server/CriterionTrigger.java | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java +index 4fe732447..6e5d81daf 100644 +--- a/src/main/java/net/minecraft/server/CriterionTrigger.java ++++ b/src/main/java/net/minecraft/server/CriterionTrigger.java +@@ -27,6 +27,7 @@ public interface CriterionTrigger { + this.c = s; + } + ++ public T getInstance() { return a(); } // Purpur - OBFHELPER + public T a() { + return this.a; + } +-- +2.23.0.rc1 +