From eb13b323fd611b5310aaf1e1c543e5c9505e7e49 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 24 Jul 2019 20:20:08 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: c6987e1a Peek the unload queue for chunk generation checks (#2332) 4ac69cec Bring task execution into server tick timings (#2357) edce5384 Amend PlayerInteractAtEntityEvent javadoc for ArmorStands (#2309) 8ecd4337 Set spawning entity for fireworks spawned by a crossbow (#2358) --- Paper | 2 +- current-paper | 2 +- patches/server/0001-Rebrand.patch | 8 ++-- .../0030-Block-and-Fluid-Tick-Events.patch | 14 +++--- ...ly-grow-cactus-reeds-bamboo-chorus-f.patch | 8 ++-- ...ance-for-zombie-horse-natural-spawns.patch | 6 +-- ...52-Asynchronous-chunk-IO-and-loading.patch | 45 ++++++++++--------- ...ement-optional-per-player-mob-spawns.patch | 20 ++++----- 8 files changed, 53 insertions(+), 52 deletions(-) diff --git a/Paper b/Paper index ad8dbf3d2..c6987e1a0 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit ad8dbf3d2bf60b3154eba52c59cbe13dcd82631d +Subproject commit c6987e1a02aee696893a335f2d048f7df5c38304 diff --git a/current-paper b/current-paper index 0d10a748f..9b911e859 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.4--b077750fa4913b494b42713a742afd780dd2097d +1.14.4--0369665e6b9baedf0da91fc7d4289d54ebe3c064 diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 11e89cb3a..6e53025dd 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From c9814cac1d9c5d1fff68005d5265a232972460bc Mon Sep 17 00:00:00 2001 +From 99abe96927a7347e1f3ab5604567ba0f66fd9b01 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java diff --git a/pom.xml b/pom.xml -index 0130272236..d1d3973928 100644 +index beda5dc8a2..a12fa0163c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -86,10 +86,10 @@ index cd6e259239..bb227bc0fb 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e9a4973592..57a1ab8b9e 100644 +index 01b389d89f..81ed2dfd25 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1433,7 +1433,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 6 Jun 2019 23:23:52 -0500 Subject: [PATCH] Block and Fluid Tick Events @@ -10,10 +10,10 @@ Subject: [PATCH] Block and Fluid Tick Events 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6491596538..8446dfd0a0 100644 +index b8e964c974..5d319d1371 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -445,13 +445,13 @@ public class WorldServer extends World { +@@ -451,13 +451,13 @@ public class WorldServer extends World { gameprofilerfiller.enter("randomTick"); IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k); @@ -29,7 +29,7 @@ index 6491596538..8446dfd0a0 100644 fluid.b(this, blockposition2, this.random); } -@@ -540,6 +540,7 @@ public class WorldServer extends World { +@@ -546,6 +546,7 @@ public class WorldServer extends World { Fluid fluid = this.getFluid(nextticklistentry.a); if (fluid.getType() == nextticklistentry.b()) { @@ -37,7 +37,7 @@ index 6491596538..8446dfd0a0 100644 fluid.a((World) this, nextticklistentry.a); } -@@ -549,6 +550,7 @@ public class WorldServer extends World { +@@ -555,6 +556,7 @@ public class WorldServer extends World { IBlockData iblockdata = this.getType(nextticklistentry.a); if (iblockdata.getBlock() == nextticklistentry.b()) { @@ -62,10 +62,10 @@ index 9dfba251ea..775d40ab1b 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a734a87c41..9b4e57424e 100644 +index a2b6c3c94a..42bab6d574 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2338,6 +2338,24 @@ public class CraftWorld implements World { +@@ -2349,6 +2349,24 @@ public class CraftWorld implements World { } // Paper end diff --git a/patches/server/0043-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch b/patches/server/0043-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch index 69dae863f..245c69f88 100644 --- a/patches/server/0043-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch +++ b/patches/server/0043-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch @@ -1,4 +1,4 @@ -From 78d88ca55294ef74d648f668570654a8ddc22aba Mon Sep 17 00:00:00 2001 +From 7f40cc8f40da0c4133ed7c5e4de13e406fdc6cf3 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Thu, 16 May 2019 01:33:46 +0100 Subject: [PATCH] Fix MC-113809 Only grow cactus/reeds/bamboo/chorus fruit on @@ -14,7 +14,7 @@ Subject: [PATCH] Fix MC-113809 Only grow cactus/reeds/bamboo/chorus fruit on 6 files changed, 7 insertions(+) diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 0257aca803..2390788b61 100644 +index f9747fb18d..4a537d1d79 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -31,6 +31,7 @@ public class Block implements IMaterial { @@ -74,10 +74,10 @@ index ff674a9d5b..4a13e248ed 100644 for (i = 1; world.getType(blockposition.down(i)).getBlock() == this; ++i) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5f82145723..8c08cf612a 100644 +index 5d319d1371..f780aea01a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -446,7 +446,9 @@ public class WorldServer extends World { +@@ -452,7 +452,9 @@ public class WorldServer extends World { IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k); if (iblockdata.q()&& (!purpurConfig.blockTickEvent || new net.pl3x.purpur.event.block.BlockTickEvent(getWorld(), blockposition2.x, blockposition2.y, blockposition2.z, true).callEvent())) { // Purpur diff --git a/patches/server/0044-Add-chance-for-zombie-horse-natural-spawns.patch b/patches/server/0044-Add-chance-for-zombie-horse-natural-spawns.patch index 963d2c479..10dfdfd6a 100644 --- a/patches/server/0044-Add-chance-for-zombie-horse-natural-spawns.patch +++ b/patches/server/0044-Add-chance-for-zombie-horse-natural-spawns.patch @@ -1,4 +1,4 @@ -From ce047122254937ebf8c457cfc7e02125699be970 Mon Sep 17 00:00:00 2001 +From 7a308187a76c55a72d4822a854c36e95d6517606 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 7 Jul 2019 19:52:16 -0500 Subject: [PATCH] Add chance for zombie horse natural spawns @@ -8,10 +8,10 @@ Subject: [PATCH] Add chance for zombie horse natural spawns 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index fb2f35e9d4..b2cfdecb4a 100644 +index f780aea01a..917fbb35b4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -396,12 +396,18 @@ public class WorldServer extends World { +@@ -402,12 +402,18 @@ public class WorldServer extends World { boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper if (flag1) { diff --git a/patches/server/0052-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0052-Asynchronous-chunk-IO-and-loading.patch index 7b84602df..67a38c940 100644 --- a/patches/server/0052-Asynchronous-chunk-IO-and-loading.patch +++ b/patches/server/0052-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 63a3866ef5cccf783042f255d664176a0387719f Mon Sep 17 00:00:00 2001 +From d984124be7de318154ca820efc6c4f94744cf007 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 @@ -159,10 +159,10 @@ and some poi tasks). create mode 100644 src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java -index 366de66657..2b8f064ba3 100644 +index 92c32c48d2..f4d5db02f7 100644 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java -@@ -52,6 +52,17 @@ public class WorldTimingsHandler { +@@ -58,6 +58,17 @@ public class WorldTimingsHandler { public final Timing worldSaveLevel; public final Timing chunkSaveData; @@ -180,10 +180,10 @@ index 366de66657..2b8f064ba3 100644 public WorldTimingsHandler(World server) { String name = server.worldData.getName() +" - "; -@@ -99,6 +110,17 @@ public class WorldTimingsHandler { - tracker2 = Timings.ofSafe(name + "tracker stage 2"); - doTick = Timings.ofSafe(name + "doTick"); - tickEntities = Timings.ofSafe(name + "tickEntities"); +@@ -112,6 +123,17 @@ public class WorldTimingsHandler { + chunkProviderTick = Timings.ofSafe(name + "Chunk provider tick"); + broadcastChunkUpdates = Timings.ofSafe(name + "Broadcast chunk updates"); + countNaturalMobs = Timings.ofSafe(name + "Count natural mobs"); + + poiUnload = Timings.ofSafe(name + "Chunk unload - POI"); + chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk"); @@ -2271,7 +2271,7 @@ index 0000000000..03cb8e0b32 + +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 775b5f7fe3..5c6f9c4809 100644 +index b465136a66..0e977a8472 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -160,11 +160,137 @@ public class ChunkProviderServer extends IChunkProvider { @@ -2803,7 +2803,7 @@ index 23d1935dd5..14f8b61042 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d5a9a5f069..a4bd7348eb 100644 +index ab2c002bc1..57b1dd4145 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -774,6 +774,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant getChunkAtAsync(int x, int z, boolean gen) { 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 209d828e0..aad03df46 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 25ba7be0350d6cecf3f97c1b8f3c15cb76cab74b Mon Sep 17 00:00:00 2001 +From c8a1368c07cb0ba0bfe9c44c7ddb36cf8c2b354d 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 @@ -13,7 +13,7 @@ Subject: [PATCH] implement optional per player mob spawns 6 files changed, 76 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ff520d9e86..c2823c10f9 100644 +index 318a470eea..72b77e27e8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -509,6 +509,11 @@ public class PaperWorldConfig { @@ -29,10 +29,10 @@ index ff520d9e86..c2823c10f9 100644 private void countAllMobsForSpawning() { countAllMobsForSpawning = getBoolean("count-all-mobs-for-spawning", false); diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index cd11efc68f..ede99204ad 100644 +index ab87387573..f2c13a07bd 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -622,9 +622,21 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -628,9 +628,21 @@ public class ChunkProviderServer extends IChunkProvider { // Paper start - only allow spawns upto the limit per chunk and update count afterwards int currEntityCount = object2intmap.getInt(enumcreaturetype); int difference = k1 - currEntityCount; @@ -57,7 +57,7 @@ index cd11efc68f..ede99204ad 100644 } } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 594c2b9aa6..bdfa18bca7 100644 +index 7d2808aa29..45594250de 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -137,6 +137,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -68,7 +68,7 @@ index 594c2b9aa6..bdfa18bca7 100644 private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) { double d0 = (double) (chunkcoordintpair.x * 16 + 8); double d1 = (double) (chunkcoordintpair.z * 16 + 8); -@@ -1322,6 +1323,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1327,6 +1328,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } @@ -168,7 +168,7 @@ index 925efd4a15..70580355c6 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3e66e1782c..f98b4346b5 100644 +index dc710b2fbd..c28df6137b 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 { @@ -179,7 +179,7 @@ index 3e66e1782c..f98b4346b5 100644 // CraftBukkit start private int tickPosition; -@@ -931,6 +932,7 @@ public class WorldServer extends World { +@@ -937,6 +938,7 @@ public class WorldServer extends World { } public Object2IntMap l() { @@ -187,7 +187,7 @@ index 3e66e1782c..f98b4346b5 100644 Object2IntMap object2intmap = new Object2IntOpenHashMap(); ObjectIterator objectiterator = this.entitiesById.values().iterator(); -@@ -949,6 +951,7 @@ public class WorldServer extends World { +@@ -955,6 +957,7 @@ public class WorldServer extends World { EnumCreatureType enumcreaturetype = entity.getEntityType().e(); if (enumcreaturetype != EnumCreatureType.MISC && this.getChunkProvider().b(entity)) { @@ -195,7 +195,7 @@ index 3e66e1782c..f98b4346b5 100644 // Paper start - Only count natural spawns if (!this.paperConfig.countAllMobsForSpawning && !(entity.spawnReason == CreatureSpawnEvent.SpawnReason.NATURAL || -@@ -960,9 +963,42 @@ public class WorldServer extends World { +@@ -966,9 +969,42 @@ public class WorldServer extends World { } }