From 4e44c2b38cb336ccd825bd99c905d2daef3eec22 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 7 Oct 2017 09:57:38 +0100 Subject: [PATCH] Update CB/S --- ...ancementDataWorld-thanks-to-Spigot-b.patch | 22 ------------------- ...ms-to-redirect-System.out-err-to-lo.patch} | 4 ++-- ...-prefixes-using-Log4J-configuration.patch} | 6 ++--- ...Include-Log4J2-SLF4J-implementation.patch} | 6 ++--- ...efix-for-various-plugins-bypassing-.patch} | 4 ++-- ...t.patch => 0241-Add-PlayerJumpEvent.patch} | 6 ++--- ...-handle-PacketPlayInKeepAlive-async.patch} | 4 ++-- work/CraftBukkit | 2 +- work/Spigot | 2 +- 9 files changed, 17 insertions(+), 39 deletions(-) delete mode 100644 Spigot-Server-Patches/0237-Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch rename Spigot-Server-Patches/{0238-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (96%) rename Spigot-Server-Patches/{0239-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0238-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%) rename Spigot-Server-Patches/{0240-Include-Log4J2-SLF4J-implementation.patch => 0239-Include-Log4J2-SLF4J-implementation.patch} (86%) rename Spigot-Server-Patches/{0241-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (96%) rename Spigot-Server-Patches/{0242-Add-PlayerJumpEvent.patch => 0241-Add-PlayerJumpEvent.patch} (96%) rename Spigot-Server-Patches/{0243-handle-PacketPlayInKeepAlive-async.patch => 0242-handle-PacketPlayInKeepAlive-async.patch} (95%) diff --git a/Spigot-Server-Patches/0237-Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch b/Spigot-Server-Patches/0237-Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch deleted file mode 100644 index 61b3313d9c..0000000000 --- a/Spigot-Server-Patches/0237-Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0dc45e0c967f8c83f88fee01e0175a4319b6c985 Mon Sep 17 00:00:00 2001 -From: kashike -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 -@@ -396,7 +396,7 @@ 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"})); --- -2.14.1 - diff --git a/Spigot-Server-Patches/0238-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch similarity index 96% rename from Spigot-Server-Patches/0238-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch rename to Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index b504df2b29..2bd90ba334 100644 --- a/Spigot-Server-Patches/0238-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From a7ced92f0d09b6e25e5c66dc24db2da45f3341f7 Mon Sep 17 00:00:00 2001 +From d2bbc4038ff2bd80039f56629ce97eeeee860ece Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger @@ -47,5 +47,5 @@ index b3f1aa999..854455711 100644 thread.setDaemon(true); -- -2.14.1 +2.14.2 diff --git a/Spigot-Server-Patches/0239-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 97% rename from Spigot-Server-Patches/0239-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch index cb65865be6..41957f6f36 100644 --- a/Spigot-Server-Patches/0239-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From c5fa4d29b7cf19517b522dc34ce0d3c3aec40b04 Mon Sep 17 00:00:00 2001 +From 73313a0ccd12adf501c9b1334743a6af965079db Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:55 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J configuration @@ -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 @@ -282,7 +282,7 @@ public class SpigotConfig @@ -70,5 +70,5 @@ index 08b6bb7f9..9f8334376 100644 -- -2.14.1 +2.14.2 diff --git a/Spigot-Server-Patches/0240-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch similarity index 86% rename from Spigot-Server-Patches/0240-Include-Log4J2-SLF4J-implementation.patch rename to Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch index 2c01e2e79d..d17b679e0f 100644 --- a/Spigot-Server-Patches/0240-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch @@ -1,11 +1,11 @@ -From e4b022439652ed4b044c10cadb7525671bcd54f3 Mon Sep 17 00:00:00 2001 +From 3eed4ccb095324b5502a8c4872320f2161dc505e Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:35 +0200 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 @@ -98,6 +98,12 @@ @@ -22,5 +22,5 @@ index fa726851b..647b2c619 100644 org.apache.logging.log4j log4j-iostreams -- -2.14.1 +2.14.2 diff --git a/Spigot-Server-Patches/0241-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch similarity index 96% rename from Spigot-Server-Patches/0241-Disable-logger-prefix-for-various-plugins-bypassing-.patch rename to Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch index 8218f7770c..ee6c8d10cc 100644 --- a/Spigot-Server-Patches/0241-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From 8f6662b78aa50b814c65312928337c13e61d2de7 Mon Sep 17 00:00:00 2001 +From 0c978c95e05286d0a6ec7de0bdc886189e5688cb Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 23 Sep 2017 21:07:20 +0200 Subject: [PATCH] Disable logger prefix for various plugins bypassing the @@ -35,5 +35,5 @@ index 9f8334376..6711e6dff 100644 -- -2.14.1 +2.14.2 diff --git a/Spigot-Server-Patches/0242-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch similarity index 96% rename from Spigot-Server-Patches/0242-Add-PlayerJumpEvent.patch rename to Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch index dcb5ea19a3..240f4b61bf 100644 --- a/Spigot-Server-Patches/0242-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From 57644ab38ce0b45b0012bc36bfa7a15304e50162 Mon Sep 17 00:00:00 2001 +From 3f16c3b440955cf38b7d054a68f1d51afa1b9559 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:44 -0400 Subject: [PATCH] Add PlayerJumpEvent @@ -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 @@ -57,6 +57,7 @@ import org.bukkit.inventory.EquipmentSlot; @@ -65,5 +65,5 @@ index 760cb16c3..37a59de54 100644 this.player.move(EnumMoveType.PLAYER, d7, d8, d9); -- -2.14.1.windows.1 +2.14.2 diff --git a/Spigot-Server-Patches/0243-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch similarity index 95% rename from Spigot-Server-Patches/0243-handle-PacketPlayInKeepAlive-async.patch rename to Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch index 45aeb2b5aa..0aaed56655 100644 --- a/Spigot-Server-Patches/0243-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From 71c530ba24dbb9b09ac9f69af2d69fa404927df1 Mon Sep 17 00:00:00 2001 +From c6bd04a820cb66f135dd47ac3fb8c4f4fb2c5367 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async @@ -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 @@ -2225,14 +2225,18 @@ 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