From 2fd8cba9f4007a65e0d7a9b3f3567551b5f9774f 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/Add-FastUtil-to-Bukkit.patch | 2 +- .../Allow-plugins-to-use-SLF4J-for-logging.patch | 2 +- Spigot-API-Patches/POM-changes.patch | 5 +++-- Spigot-API-Patches/Use-ASM-for-event-executors.patch | 2 +- ...dd-Debug-Entities-option-to-debug-dupe-uuid-issues.patch | 2 +- .../Add-Early-Warning-Feature-to-WatchDog.patch | 2 +- Spigot-Server-Patches/Basic-PlayerProfile-API.patch | 2 +- .../Configurable-Keep-Spawn-Loaded-range-per-world.patch | 4 ++-- Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch | 2 +- .../Entity-AddTo-RemoveFrom-World-Events.patch | 2 +- Spigot-Server-Patches/Entity-Origin-API.patch | 2 +- Spigot-Server-Patches/Entity-getEntitySpawnReason.patch | 2 +- .../Expand-World.spawnParticle-API-and-add-Builder.patch | 2 +- ...x-CraftServer-isPrimaryThread-and-MinecraftServer-.patch | 2 +- Spigot-Server-Patches/Fix-Double-World-Add-issues.patch | 2 +- ...Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch | 2 +- .../Further-improve-server-tick-loop.patch | 2 +- .../Ignore-Dead-Entities-in-entityList-iteration.patch | 2 +- .../Implement-extended-PaperServerListPingEvent.patch | 2 +- ...prove-Maps-in-item-frames-performance-and-bug-fixe.patch | 2 +- Spigot-Server-Patches/InventoryCloseEvent-Reason-API.patch | 2 +- .../Limit-lightning-strike-effect-distance.patch | 2 +- ...ly-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch | 4 ++-- Spigot-Server-Patches/Optimize-Hoppers.patch | 2 +- Spigot-Server-Patches/Optimize-UserCache-Thread-Safe.patch | 2 +- Spigot-Server-Patches/Optimize-World-Time-Updates.patch | 2 +- Spigot-Server-Patches/Optimize-explosions.patch | 2 +- Spigot-Server-Patches/POM-Changes.patch | 4 ++-- .../Properly-handle-async-calls-to-restart-the-server.patch | 2 +- .../Re-add-vanilla-entity-warnings-for-duplicates.patch | 2 +- ...nd-nearby-packets-from-world-player-list-not-serve.patch | 2 +- Spigot-Server-Patches/Server-Tick-Events.patch | 2 +- ...ow-Paper-in-client-crashes-server-lists-and-Mojang.patch | 2 +- Spigot-Server-Patches/Timings-v2.patch | 6 +++--- ...e-TerminalConsoleAppender-for-console-improvements.patch | 4 ++-- Spigot-Server-Patches/incremental-chunk-saving.patch | 4 ++-- .../remove-null-possibility-for-getServer-singleton.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 40 files changed, 49 insertions(+), 48 deletions(-) diff --git a/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch index 0469abfe7..51be4c40b 100644 --- a/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch @@ -6,7 +6,7 @@ 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 @@ -0,0 +0,0 @@ diff --git a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch index 4da5c8dd9..4c53a93a7 100644 --- a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ 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 @@ -0,0 +0,0 @@ diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch index 1b9ea5379..c5549824b 100644 --- a/Spigot-API-Patches/POM-changes.patch +++ b/Spigot-API-Patches/POM-changes.patch @@ -5,7 +5,7 @@ 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 @@ -0,0 +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 diff --git a/Spigot-API-Patches/Use-ASM-for-event-executors.patch b/Spigot-API-Patches/Use-ASM-for-event-executors.patch index 0f4fe7299..b73551d50 100644 --- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ 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 @@ -0,0 +0,0 @@ diff --git a/Spigot-Server-Patches/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 1cd5d92b9..8979245d2 100644 --- a/Spigot-Server-Patches/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -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 @@ -0,0 +0,0 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/Add-Early-Warning-Feature-to-WatchDog.patch index be07df141..22439283b 100644 --- a/Spigot-Server-Patches/Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/Add-Early-Warning-Feature-to-WatchDog.patch @@ -36,7 +36,7 @@ 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 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant= 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 @@ -0,0 +0,0 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch index d4b7eebee..008ea2af9 100644 --- a/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch @@ -72,7 +72,7 @@ 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 @@ -0,0 +0,0 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch index b8a363d81..6408f7c56 100644 --- a/Spigot-Server-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch @@ -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 @@ -0,0 +0,0 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index d83f2b23c..548cc9630 100644 --- a/Spigot-Server-Patches/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -16,7 +16,7 @@ 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 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrantspigot + paper jar - 1.14.3-SNAPSHOT + 1.14.3-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ + Paper diff --git a/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch index bd6c87422..372345bf9 100644 --- a/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch @@ -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 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant