From 304244232f37bd0feceb7d29b4662a5cece0ea89 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 25 Jun 2019 14:55:44 +0100 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: aba2aaaf Correct pom.xml version CraftBukkit Changes: e8b39d43 SPIGOT-5103: World.save does not save gamerules 3164e531 Correct pom.xml version Spigot Changes: 595711b0 Correct pom.xml version --- Spigot-API-Patches/0001-POM-changes.patch | 17 ++++++++-------- .../0002-Add-FastUtil-to-Bukkit.patch | 6 +++--- .../0022-Use-ASM-for-event-executors.patch | 6 +++--- ...low-plugins-to-use-SLF4J-for-logging.patch | 6 +++--- Spigot-Server-Patches/0001-POM-Changes.patch | 6 +++--- Spigot-Server-Patches/0009-Timings-v2.patch | 20 +++++++++---------- ...ient-crashes-server-lists-and-Mojang.patch | 6 +++--- ...023-Further-improve-server-tick-loop.patch | 8 ++++---- .../0025-Entity-Origin-API.patch | 6 +++--- .../0032-Optimize-explosions.patch | 6 +++--- ...ckPhysicsEvent-if-a-plugin-has-a-lis.patch | 8 ++++---- ...Entity-AddTo-RemoveFrom-World-Events.patch | 8 ++++---- ...-possibility-for-getServer-singleton.patch | 6 +++--- ...item-frames-performance-and-bug-fixe.patch | 6 +++--- .../0105-Optimize-UserCache-Thread-Safe.patch | 6 +++--- .../0111-Fix-Double-World-Add-issues.patch | 6 +++--- ...le-async-calls-to-restart-the-server.patch | 10 +++++----- ...oleAppender-for-console-improvements.patch | 10 +++++----- .../0162-Basic-PlayerProfile-API.patch | 8 ++++---- ...nt-extended-PaperServerListPingEvent.patch | 6 +++--- ...ld.spawnParticle-API-and-add-Builder.patch | 6 +++--- .../0248-InventoryCloseEvent-Reason-API.patch | 8 ++++---- ...nilla-entity-warnings-for-duplicates.patch | 6 +++--- ...ies-option-to-debug-dupe-uuid-issues.patch | 8 ++++---- ...ead-Entities-in-entityList-iteration.patch | 10 +++++----- ...dd-Early-Warning-Feature-to-WatchDog.patch | 6 +++--- ...ets-from-world-player-list-not-serve.patch | 8 ++++---- .../0291-Optimize-Hoppers.patch | 6 +++--- ...mit-lightning-strike-effect-distance.patch | 6 +++--- .../0337-Optimize-World-Time-Updates.patch | 6 +++--- .../0369-Entity-getEntitySpawnReason.patch | 6 +++--- .../0375-Server-Tick-Events.patch | 8 ++++---- ...isPrimaryThread-and-MinecraftServer-.patch | 6 +++--- ...h-entity-loss-due-to-unloaded-chunks.patch | 6 +++--- .../0391-Duplicate-UUID-Resolve-Option.patch | 8 ++++---- ...le-Keep-Spawn-Loaded-range-per-world.patch | 8 ++++---- .../0400-incremental-chunk-saving.patch | 8 ++++---- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 40 files changed, 144 insertions(+), 143 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 8330623608..51fcc8fe75 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,14 +1,14 @@ -From 614fd245b215d849e362c4d12e258a741ce94292 Mon Sep 17 00:00:00 2001 +From 5517592aa39fa15d51e8e186af82b46219c0223e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 83eb5a39..41708a2b 100644 +index b5532ae6..a85aaa1a 100644 --- a/pom.xml +++ b/pom.xml -@@ -2,34 +2,28 @@ +@@ -2,34 +2,29 @@ 4.0.0 @@ -22,7 +22,8 @@ index 83eb5a39..41708a2b 100644 - spigot-api + com.destroystokyo.paper + paper-api - 1.14.3-SNAPSHOT + 1.14.3-R0.1-SNAPSHOT ++ jar - Spigot-API @@ -53,7 +54,7 @@ index 83eb5a39..41708a2b 100644 com.google.guava -@@ -113,15 +125,12 @@ +@@ -113,15 +126,12 @@ @@ -102,7 +103,7 @@ index 83eb5a39..41708a2b 100644 -@@ -156,6 +165,7 @@ +@@ -156,6 +166,7 @@ diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index 4051217ac2..ddc225921b 100644 --- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch @@ -1,4 +1,4 @@ -From 4d727d07067bf90febccacc7c46b151e7a4dfc3f Mon Sep 17 00:00:00 2001 +From fa8d0d47698759ed68d4d63544b943369a5fa77c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 1 Apr 2016 00:02:47 -0400 Subject: [PATCH] Add FastUtil to Bukkit @@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/pom.xml b/pom.xml -index 41708a2b..3b650cbc 100644 +index a85aaa1a..e65cbc15 100644 --- a/pom.xml +++ b/pom.xml -@@ -49,6 +49,12 @@ +@@ -50,6 +50,12 @@ diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index 0d2fd049e1..f9bb0f9914 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From 679dc954b994c687b3452e062e561111fefac478 Mon Sep 17 00:00:00 2001 +From 69ce0886b5a5faff5c6f3b0cd144d74e15e26f62 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index 3b650cbc..baefc0ff 100644 +index e65cbc15..a1dd0ac2 100644 --- a/pom.xml +++ b/pom.xml -@@ -128,6 +128,17 @@ +@@ -129,6 +129,17 @@ 7.1 test diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index da92df337f..02d1ae0980 100644 --- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 69b0848c5c15e72438a938b8eb0c823b21f27129 Mon Sep 17 00:00:00 2001 +From 20af2ff69a3f0159a59f104960b7b769cea9901f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:12 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging @@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index baefc0ff..5dc31841 100644 +index a1dd0ac2..df8fc517 100644 --- a/pom.xml +++ b/pom.xml -@@ -109,6 +109,13 @@ +@@ -110,6 +110,13 @@ 17.0.0 provided diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index df93f2579b..464b2a7db4 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 08c853033acfa5e344cbc2b46ed4235af0f118a7 Mon Sep 17 00:00:00 2001 +From 4c628f35e6729657249dce1859413e0a61822416 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 1dd649086b..e8134bf0eb 100644 +index 519a3319ca..75c1b84f6a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -16,7 +16,7 @@ index 1dd649086b..e8134bf0eb 100644 - spigot + paper jar - 1.14.3-SNAPSHOT + 1.14.3-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ + Paper diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index a0e3c01528..4873623f02 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From 76dcdc64de5d833b1e1af35a33a9351fb39ddb68 Mon Sep 17 00:00:00 2001 +From 554942503174382dace3707a50aae22d61ee67b9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -659,7 +659,7 @@ index e0b12e1fd7..30aa4f56d3 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 41638b680d..73b1041c8c 100644 +index f9ec2b0686..d0419119b3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -54,7 +54,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -671,7 +671,7 @@ index 41638b680d..73b1041c8c 100644 import org.spigotmc.SlackActivityAccountant; // Spigot public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant implements IMojangStatistics, ICommandListener, AutoCloseable, Runnable { -@@ -670,6 +670,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit @@ -703,7 +703,7 @@ index 41638b680d..73b1041c8c 100644 } this.methodProfiler.enter("snooper"); -@@ -998,30 +997,29 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -19,10 +19,10 @@ index 3f35a28ba1..cf00f35a5b 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 73b1041c8c..5e0f28b3fe 100644 +index d0419119b3..1346fc35c5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1281,7 +1281,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5e0f28b3fe..0a6a8c372d 100644 +index 1346fc35c5..968ce67956 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -147,7 +147,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API @@ -101,10 +101,10 @@ index ce510c4867..b7c94fe238 100644 if (i >= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 09560368fd..8e2f34ded7 100644 +index 229cff562f..16da9c7acf 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1093,6 +1093,11 @@ public class WorldServer extends World { +@@ -1103,6 +1103,11 @@ public class WorldServer extends World { this.I.add(((EntityInsentient) entity).getNavigation()); } entity.valid = true; // CraftBukkit diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index 4e70f1af0a..e587904403 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From d36da1b37c9f54484374dc44f57812a19bc59b86 Mon Sep 17 00:00:00 2001 +From 0c07fa8b0166461f1f94dc0d8a825d4a5c1066eb Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -123,10 +123,10 @@ index 7c1305164d..594e7bd94c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0a6a8c372d..52c0d52046 100644 +index 968ce67956..ffa208e81b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1125,6 +1125,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener @@ -32,10 +32,10 @@ index ef392f5fe8..227fe073fd 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 52c0d52046..4e1c03a78c 100644 +index ffa208e81b..a87df2b6fb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1091,6 +1091,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 513892aa85..7bfe2b047b 100644 +index b7e98bc269..edcb99be2c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1099,6 +1099,7 @@ public class WorldServer extends World { +@@ -1109,6 +1109,7 @@ public class WorldServer extends World { entity.origin = entity.getBukkitEntity().getLocation(); } // Paper end @@ -16,7 +16,7 @@ index 513892aa85..7bfe2b047b 100644 } } -@@ -1108,6 +1109,7 @@ public class WorldServer extends World { +@@ -1118,6 +1119,7 @@ public class WorldServer extends World { if (this.tickingEntities) { throw new IllegalStateException("Removing entity while ticking!"); } else { diff --git a/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch index a63036f186..734219b37b 100644 --- a/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From aa72827fd9ad7117a8a9fdeb5a4ef07fa6d5bed8 Mon Sep 17 00:00:00 2001 +From c075027493e979bc49c932fb993f717f573dc2d1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton to stop IDE complaining about potential NPE diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f88e42423d..f489d47c60 100644 +index ccfe1b4c3e..1dda1fee9f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -59,6 +59,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot @@ -25,7 +25,7 @@ index f88e42423d..f489d47c60 100644 this.ad = new ResourceManager(EnumResourcePackType.SERVER_DATA, this.serverThread); this.resourcePackRepository = new ResourcePackRepository<>(ResourcePackLoader::new); this.ah = new CraftingManager(); -@@ -1907,7 +1909,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -102,10 +102,10 @@ index fc08158937..090d3dbd31 100644 for ( org.bukkit.map.MapCursor cursor : render.cursors) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7bfe2b047b..7b19d74597 100644 +index edcb99be2c..fd2a204d3e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1036,6 +1036,7 @@ public class WorldServer extends World { +@@ -1046,6 +1046,7 @@ public class WorldServer extends World { { if ( iter.next().trackee == entity ) { diff --git a/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch index 65455367c8..8127a32972 100644 --- a/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From b9e60337d725ca6dfb42893d103124c0f0f68b36 Mon Sep 17 00:00:00 2001 +From 2e5a1a3634a10dcdc74ea8769675d9103b2071f6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -10,10 +10,10 @@ Additionally, move Saving of the User cache to be done async, incase the user never changed the default setting for Spigot's save on stop only. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f489d47c60..ff879d9bd0 100644 +index 1dda1fee9f..065062c616 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -736,7 +736,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -8,10 +8,10 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7b19d74597..cb2b55de52 100644 +index fd2a204d3e..8fd4478f2b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -926,6 +926,7 @@ public class WorldServer extends World { +@@ -936,6 +936,7 @@ public class WorldServer extends World { // CraftBukkit start private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot diff --git a/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch index 9761614801..86ebc5e9f4 100644 --- a/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From d32338b1651e63ce6cb2dc9caf8996f4001d8a92 Mon Sep 17 00:00:00 2001 +From 8eab04cea452331e234fd2e9efab94ba9b062fc0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ff879d9bd0..302a015790 100644 +index 065062c616..36d29b3324 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -78,6 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index e8134bf0eb..ef508bbd71 100644 +index 75c1b84f6a..58ccbaa1ae 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,27 @@ @@ -185,7 +185,7 @@ index 6e1509c2c1..26b35855e1 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 302a015790..4cf05e56fb 100644 +index 36d29b3324..f340f4bfe3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -48,7 +48,7 @@ import org.apache.commons.lang3.Validate; @@ -225,7 +225,7 @@ index 302a015790..4cf05e56fb 100644 Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this)); } // CraftBukkit end -@@ -927,7 +931,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -429,10 +429,10 @@ index 1f6a126329..6d278a0da5 100644 * Calculates distance between 2 entities * @param e1 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4cf05e56fb..bf63e9ff33 100644 +index f340f4bfe3..c229651b50 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1240,7 +1240,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -177,7 +177,7 @@ index 0000000000..a85466bc7e + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bf63e9ff33..f21b825719 100644 +index c229651b50..946803e2be 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,5 +1,8 @@ @@ -189,7 +189,7 @@ index bf63e9ff33..f21b825719 100644 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.JsonElement; -@@ -1043,7 +1046,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant= 5000000000L) { this.Y = i; this.serverPing.setPlayerSample(new ServerPing.ServerPingPlayerSample(this.getMaxPlayers(), this.getPlayerCount())); diff --git a/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch index 5eccf07d43..5c11c7398e 100644 --- a/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 280ecc1a95cda2a1b64c508670b900f902527210 Mon Sep 17 00:00:00 2001 +From 6a652351f60fd0d151663a43c4fc08cf06169867 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1fddc5fda2..4ebc9b50fb 100644 +index 6bd60ce46c..4e17f74ff0 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -48,7 +48,7 @@ public class WorldServer extends World { @@ -22,7 +22,7 @@ index 1fddc5fda2..4ebc9b50fb 100644 boolean tickingEntities; private final MinecraftServer server; private final WorldNBTStorage dataManager; -@@ -1321,12 +1321,17 @@ public class WorldServer extends World { +@@ -1331,12 +1331,17 @@ public class WorldServer extends World { } public int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) { diff --git a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch index ca7256063b..561292eb6f 100644 --- a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 58ba763c5947745c305f8c75eb447fd464f04162 Mon Sep 17 00:00:00 2001 +From 948edd8a1cb0f5e2518a52386f557246e1ab7fb8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -114,10 +114,10 @@ index a167843bfb..9e5cd22d7d 100644 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game"); cserver.getPluginManager().callEvent(playerQuitEvent); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 4ebc9b50fb..af947df472 100644 +index 4e17f74ff0..c55a2a213f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -979,7 +979,7 @@ public class WorldServer extends World { +@@ -989,7 +989,7 @@ public class WorldServer extends World { { if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity ) { @@ -126,7 +126,7 @@ index 4ebc9b50fb..af947df472 100644 } } } -@@ -1002,7 +1002,7 @@ public class WorldServer extends World { +@@ -1012,7 +1012,7 @@ public class WorldServer extends World { { if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity ) { diff --git a/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch index 56a2434196..11129863f6 100644 --- a/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -1,4 +1,4 @@ -From b2bae68a9c895972449ba774a74171469be8e13b Mon Sep 17 00:00:00 2001 +From 8c526f139e36db37c38b5bcea39c42781da65d6f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:08:05 -0400 Subject: [PATCH] Re-add vanilla entity warnings for duplicates @@ -8,10 +8,10 @@ These are a critical sign that somethin went wrong, and you've lost some data... We should kind of know about these things you know. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index af947df472..4efc310d93 100644 +index c55a2a213f..1e727fa989 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -964,7 +964,8 @@ public class WorldServer extends World { +@@ -974,7 +974,8 @@ public class WorldServer extends World { if (entity1 == null) { return false; } else { diff --git a/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 46537501f9..ae2b732ea8 100644 --- a/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -1,4 +1,4 @@ -From 12ee9e1a682177e3264cc0e1507ed00dd5048425 Mon Sep 17 00:00:00 2001 +From 6b76b838c87ba763ff99a5c639382d2dabe59ddd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 08:25:40 -0400 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues @@ -52,7 +52,7 @@ index 985b459efe..f476f326f1 100644 public boolean captureBlockStates = false; public boolean captureTreeGeneration = false; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 4efc310d93..54b4d649d1 100644 +index 1e727fa989..e36e1c2721 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -69,6 +69,9 @@ public class WorldServer extends World { @@ -65,7 +65,7 @@ index 4efc310d93..54b4d649d1 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { -@@ -928,6 +931,12 @@ public class WorldServer extends World { +@@ -938,6 +941,12 @@ public class WorldServer extends World { org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper if (entity.dead) { @@ -78,7 +78,7 @@ index 4efc310d93..54b4d649d1 100644 // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit return false; } else if (this.isUUIDTaken(entity)) { -@@ -1091,7 +1100,24 @@ public class WorldServer extends World { +@@ -1101,7 +1110,24 @@ public class WorldServer extends World { } } diff --git a/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch index 2360c67390..da252d8e45 100644 --- a/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From cce4586d627b67b551e8f3e63a58caec8168a792 Mon Sep 17 00:00:00 2001 +From cf1eba4249fbb1139b10ce3007247a2b4d5d62b1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Jul 2018 12:18:27 -0400 Subject: [PATCH] Ignore Dead Entities in entityList iteration @@ -63,10 +63,10 @@ index e1cd5e72a5..b02b084556 100644 private float av; private float aw; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 54b4d649d1..6456f21d7b 100644 +index e36e1c2721..adeff1ef19 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -836,6 +836,7 @@ public class WorldServer extends World { +@@ -846,6 +846,7 @@ public class WorldServer extends World { while (objectiterator.hasNext()) { Entity entity = (Entity) objectiterator.next(); @@ -74,7 +74,7 @@ index 54b4d649d1..6456f21d7b 100644 // CraftBukkit start - Split out persistent check, don't apply it to special persistent mobs if (entity instanceof EntityInsentient) { EntityInsentient entityinsentient = (EntityInsentient) entity; -@@ -1128,6 +1129,7 @@ public class WorldServer extends World { +@@ -1138,6 +1139,7 @@ public class WorldServer extends World { entity.origin = entity.getBukkitEntity().getLocation(); } // Paper end @@ -82,7 +82,7 @@ index 54b4d649d1..6456f21d7b 100644 new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid } -@@ -1142,6 +1144,7 @@ public class WorldServer extends World { +@@ -1152,6 +1154,7 @@ public class WorldServer extends World { this.removeEntityFromChunk(entity); this.entitiesById.remove(entity.getId()); this.unregisterEntity(entity); diff --git a/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch index 06bc37cb50..999391656c 100644 --- a/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From 26ed76d068fb392061066468cf3cfed66e998760 Mon Sep 17 00:00:00 2001 +From b26772db491bba5d3aafa87ad747cdbe65fb5874 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Wed, 8 Aug 2018 15:30:52 -0400 Subject: [PATCH] Add Early Warning Feature to WatchDog @@ -36,10 +36,10 @@ index 207e5d3e23..a13c8c68b6 100644 public static int tabSpamLimit = 500; private static void tabSpamLimiters() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f21b825719..5daee73a84 100644 +index 946803e2be..fe8647bbc6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -846,6 +846,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list @@ -46,10 +46,10 @@ index 9e5cd22d7d..049d702cb9 100644 double d5 = d1 - entityplayer.locY; double d6 = d2 - entityplayer.locZ; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6456f21d7b..e7e6c3e949 100644 +index adeff1ef19..990c0afb85 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1177,7 +1177,7 @@ public class WorldServer extends World { +@@ -1187,7 +1187,7 @@ public class WorldServer extends World { } // CraftBukkit end this.globalEntityList.add(entitylightning); @@ -58,7 +58,7 @@ index 6456f21d7b..e7e6c3e949 100644 } @Override -@@ -1309,7 +1309,7 @@ public class WorldServer extends World { +@@ -1319,7 +1319,7 @@ public class WorldServer extends World { BlockActionData blockactiondata = (BlockActionData) this.J.removeFirst(); if (this.a(blockactiondata)) { diff --git a/Spigot-Server-Patches/0291-Optimize-Hoppers.patch b/Spigot-Server-Patches/0291-Optimize-Hoppers.patch index 24d4e70d25..e0ef55229d 100644 --- a/Spigot-Server-Patches/0291-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0291-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From f4bf1149c60116b9e9675959c53237ec0afbf000 Mon Sep 17 00:00:00 2001 +From 62264deed642f84486c25015c6936fb9d3fc6e57 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -47,10 +47,10 @@ index b9c5af51f5..ab66dbf885 100644 itemstack.d(this.C()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5daee73a84..d100200518 100644 +index fe8647bbc6..6c7ce47c5a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1123,6 +1123,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0; // Paper diff --git a/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch index 6e9d86782a..3677444b15 100644 --- a/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch @@ -1,4 +1,4 @@ -From 5707a4a4389fbc4341302f33aac2ea2d467ae792 Mon Sep 17 00:00:00 2001 +From 9a69ff4a0e316e4a1ae035872f6d248b57dfa3c2 Mon Sep 17 00:00:00 2001 From: Trigary Date: Fri, 14 Sep 2018 17:42:08 +0200 Subject: [PATCH] Limit lightning strike effect distance @@ -69,10 +69,10 @@ index 0169f261c6..da85786046 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e7e6c3e949..cce69d555d 100644 +index 990c0afb85..2870236108 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1177,7 +1177,7 @@ public class WorldServer extends World { +@@ -1187,7 +1187,7 @@ public class WorldServer extends World { } // CraftBukkit end this.globalEntityList.add(entitylightning); diff --git a/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch index 3dc9392bb5..e59431a877 100644 --- a/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From ab477a2841453fbb8110b45953360c08f760ae77 Mon Sep 17 00:00:00 2001 +From 741ab9b96c8ad7ef2ac054c881efef3c6d9853f4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -8,10 +8,10 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2198b4fbc9..252c50bb72 100644 +index cb630fda6e..f222d44706 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1110,12 +1110,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -72,10 +72,10 @@ index 65df0e7c8c..abddc8895e 100644 }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index cce69d555d..c4d2d9c1c8 100644 +index 2870236108..a85125133b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -930,6 +930,7 @@ public class WorldServer extends World { +@@ -940,6 +940,7 @@ public class WorldServer extends World { // CraftBukkit start private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot diff --git a/Spigot-Server-Patches/0375-Server-Tick-Events.patch b/Spigot-Server-Patches/0375-Server-Tick-Events.patch index f957d7a623..89118b2da8 100644 --- a/Spigot-Server-Patches/0375-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0375-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 4410433c260bf8f18b5a7cbe2f4b0b3feb104254 Mon Sep 17 00:00:00 2001 +From 8ac43d682c6b4a7609f15fbf734e754fbcb37f99 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events @@ -6,10 +6,10 @@ Subject: [PATCH] Server Tick Events Fires event at start and end of a server tick diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 252c50bb72..c20d9aab38 100644 +index f222d44706..1e2f2f8b99 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1040,6 +1040,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer @@ -16,10 +16,10 @@ handling that should have been handled synchronously will be handled synchronously when the server gets shut down. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 56951b44f9..5f62ffe182 100644 +index 55e8db8a09..8136a97f44 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1939,7 +1939,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks @@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are added to the world, or a valid entity moves between chunks. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c4d2d9c1c8..9a353b0482 100644 +index a85125133b..d47ef7efa0 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -635,7 +635,7 @@ public class WorldServer extends World { @@ -31,7 +31,7 @@ index c4d2d9c1c8..9a353b0482 100644 entity.inChunk = false; } else { this.getChunkAt(i, k).a(entity); -@@ -948,7 +948,7 @@ public class WorldServer extends World { +@@ -958,7 +958,7 @@ public class WorldServer extends World { return false; } // CraftBukkit end diff --git a/Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch index 2e959dfa4d..c37e3f3b5e 100644 --- a/Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From 943c29a529c68835040dbfd9873404794c6ee1f6 Mon Sep 17 00:00:00 2001 +From 00c905e8f9463fb48355510fd7912327126e0b62 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option @@ -195,7 +195,7 @@ index b38bc77c93..9102bf8b60 100644 if (list != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9a353b0482..47731c56dc 100644 +index d47ef7efa0..52a0e0a37f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -207,7 +207,7 @@ index 9a353b0482..47731c56dc 100644 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; -@@ -975,8 +977,23 @@ public class WorldServer extends World { +@@ -985,8 +987,23 @@ public class WorldServer extends World { if (entity1 == null) { return false; } else { @@ -233,7 +233,7 @@ index 9a353b0482..47731c56dc 100644 return true; } } -@@ -1107,7 +1124,7 @@ public class WorldServer extends World { +@@ -1117,7 +1134,7 @@ public class WorldServer extends World { } Entity old = this.entitiesByUUID.put(entity.getUniqueID(), entity); diff --git a/Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch index c48543db73..80aa02c0b0 100644 --- a/Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 884a33c2405b7e77c5da84c21497c7e431f85588 Mon Sep 17 00:00:00 2001 +From b72f3b3fdf5470f62e2f7dc93edccfb421a0b3cf Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -21,7 +21,7 @@ index 385b3ac0ce..b854061983 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5f62ffe182..b401ff7695 100644 +index 8136a97f44..d6c99ce897 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -569,6 +569,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving @@ -42,7 +42,7 @@ index 5bf781bb63..e2a48695df 100644 private long t; @Nullable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b401ff7695..485725c0ae 100644 +index d6c99ce897..2b99fdc630 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -155,6 +155,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant