From 6627a827b4cd7f4bcfed2f7fe6c6bba46b95edd4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 28 Aug 2018 23:16:31 -0400 Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding --- ...loit-that-allowed-colored-signs-to-be-created.patch | 6 +++--- .../0284-InventoryCloseEvent-Reason-API.patch | 6 +++--- ...-player-inventory-when-cancelling-PlayerInter.patch | 6 +++--- ...reak-up-and-make-tab-spam-limits-configurable.patch | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 22d5825fcf..83130d2049 100644 --- a/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -1,14 +1,14 @@ -From 19336c64f45b82a2cae113d99c7e9efa320cc568 Mon Sep 17 00:00:00 2001 +From afb4e25e1128b93702f63d86e60ca4fa6be40b7b Mon Sep 17 00:00:00 2001 From: 0x22 <0x22@futureclient.net> Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 93807ffa62..a7bdb9737b 100644 +index b296f948ef..f735d97be2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2515,7 +2515,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2520,7 +2520,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { String[] lines = new String[4]; for (int i = 0; i < astring.length; ++i) { diff --git a/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch index 537e6d0770..e4a01a91f0 100644 --- a/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From a57e837ad133424234ad4280450505f09098514c Mon Sep 17 00:00:00 2001 +From 7410f337fa9fc6c0ff7ecc4797c8e7da2a8e68cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -110,10 +110,10 @@ index 49470bf5f0..781c8abc39 100644 this.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a7bdb9737b..4fc5e4b7b3 100644 +index f735d97be2..6fe79e9076 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2051,7 +2051,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2056,7 +2056,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer()); if (this.player.isFrozen()) return; // CraftBukkit diff --git a/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 099e004f7c..973f7cb604 100644 --- a/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -1,4 +1,4 @@ -From d9159d08bdb72ab7d7b82edbd72b18e75dd160c2 Mon Sep 17 00:00:00 2001 +From e450d0aba6cb1b173316f615c8fea1401e7caff6 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 13 Jul 2018 14:54:43 +0200 Subject: [PATCH] Refresh player inventory when cancelling @@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4fc5e4b7b3..66e01b8131 100644 +index 6fe79e9076..5b3d39133d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1965,6 +1965,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1970,6 +1970,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { } if (event.isCancelled()) { diff --git a/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch index 17a8e6be32..425871b862 100644 --- a/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From f82212d687248903ef0e0b2ec58013f9c3c5b7ee Mon Sep 17 00:00:00 2001 +From aa104cbbb0974ec67151d8f2a6250668ede5f6f4 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 29 Jul 2018 05:02:15 +0100 Subject: [PATCH] Break up and make tab spam limits configurable @@ -45,10 +45,10 @@ index c457d07110..046bf33f66 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 66e01b8131..b7949ac256 100644 +index 5b3d39133d..906abc6541 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -77,6 +77,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -78,6 +78,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit start - multithreaded fields private volatile int chatThrottle; private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle"); @@ -56,7 +56,7 @@ index 66e01b8131..b7949ac256 100644 // CraftBukkit end private int j; private final IntHashMap k = new IntHashMap(); -@@ -206,6 +207,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -207,6 +208,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { this.minecraftServer.methodProfiler.e(); // CraftBukkit start for (int spam; (spam = this.chatThrottle) > 0 && !chatSpamField.compareAndSet(this, spam, spam - 1); ) ; @@ -64,7 +64,7 @@ index 66e01b8131..b7949ac256 100644 /* Use thread-safe field access instead if (this.chatThrottle > 0) { --this.chatThrottle; -@@ -508,7 +510,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -509,7 +511,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { public void a(PacketPlayInTabComplete packetplayintabcomplete) { // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async // CraftBukkit start