From d649f90be001f24e099e381d02be901e4bddf019 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 7 Oct 2017 09:57:38 +0100 Subject: [PATCH] Update CB/S --- .../Add-PlayerJumpEvent.patch | 2 +- ...ancementDataWorld-thanks-to-Spigot-b.patch | 20 ------------------- ...n-prefixes-using-Log4J-configuration.patch | 2 +- .../Include-Log4J2-SLF4J-implementation.patch | 2 +- .../handle-PacketPlayInKeepAlive-async.patch | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 7 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 Spigot-Server-Patches/Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch diff --git a/Spigot-Server-Patches/Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/Add-PlayerJumpEvent.patch index 5bec7c7009..93331a3bf7 100644 --- a/Spigot-Server-Patches/Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/Add-PlayerJumpEvent.patch @@ -17,7 +17,7 @@ index e9f48ecad..00fe92fa8 100644 super.cu(); this.b(StatisticList.w); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 760cb16c3..37a59de54 100644 +index e529ea60b..36af72387 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -0,0 +0,0 @@ import org.bukkit.inventory.EquipmentSlot; diff --git a/Spigot-Server-Patches/Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch b/Spigot-Server-Patches/Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch deleted file mode 100644 index 0407058235..0000000000 --- a/Spigot-Server-Patches/Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Riley Park -Date: Thu, 21 Sep 2017 07:00:43 -0700 -Subject: [PATCH] Avoid NPE in AdvancementDataWorld thanks to Spigot being dumb - - -diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 9ce3e1365..712fc1f9b 100644 ---- a/src/main/java/org/spigotmc/SpigotConfig.java -+++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -0,0 +0,0 @@ public class SpigotConfig - } - - public static boolean disableAdvancementSaving; -- public static List disabledAdvancements; -+ public static List disabledAdvancements = java.util.Collections.emptyList(); // Paper - avoid NPE in AdvancementDataWorld - private static void disabledAdvancements() { - disableAdvancementSaving = getBoolean("advancements.disable-saving", false); - disabledAdvancements = getList("advancements.disabled", Arrays.asList(new String[]{"minecraft:story/disabled"})); --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/Handle-plugin-prefixes-using-Log4J-configuration.patch index 723877cf53..13d052b77e 100644 --- a/Spigot-Server-Patches/Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -28,7 +28,7 @@ index aff997468..dfb006aa0 100644 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 712fc1f9b..b5bfb15fa 100644 +index 9ce3e1365..cc1f3ac96 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -0,0 +0,0 @@ public class SpigotConfig diff --git a/Spigot-Server-Patches/Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/Include-Log4J2-SLF4J-implementation.patch index 5624297df8..1219f5c3dc 100644 --- a/Spigot-Server-Patches/Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/Include-Log4J2-SLF4J-implementation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index fa726851b..647b2c619 100644 +index dfb006aa0..07e780b6f 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ diff --git a/Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async.patch index d2da5ad5d8..932901d26d 100644 --- a/Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async.patch @@ -12,7 +12,7 @@ disconnection to the main thread, but leave the actual processing of the packet off the main thread. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d8f9a093b..f60f21fd2 100644 +index 36af72387..14815ed4d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/work/CraftBukkit b/work/CraftBukkit index 362ed329f0..f8500c0a3e 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 362ed329f0c764cff343683f46c18c374092155d +Subproject commit f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb diff --git a/work/Spigot b/work/Spigot index 775423189f..93e20b3652 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 775423189fea374bf4f1d0391c4cf242e741185f +Subproject commit 93e20b3652e42c34d30c306592aaec7fd3a41504