From 3052144be8b625798e3ee86b4a734d0f5c25c4b9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 13 May 2017 20:37:46 -0500 Subject: [PATCH] Update upstream CB --- Spigot-Server-Patches/0186-IllegalPacketEvent.patch | 9 +++++---- .../0187-Properly-fix-item-duplication-bug.patch | 8 ++++---- ...Add-system-property-to-disable-book-size-limits.patch | 6 +++--- work/CraftBukkit | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Spigot-Server-Patches/0186-IllegalPacketEvent.patch b/Spigot-Server-Patches/0186-IllegalPacketEvent.patch index 5c439cf905..d54ae48620 100644 --- a/Spigot-Server-Patches/0186-IllegalPacketEvent.patch +++ b/Spigot-Server-Patches/0186-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From d9570be2a290ff85ba97c0239f95fdaccc56d587 Mon Sep 17 00:00:00 2001 +From abc6c09bbf47a3db7b6c4360f253ed58fcfa3148 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Jun 2016 23:33:57 -0400 Subject: [PATCH] IllegalPacketEvent @@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent Fired for invalid data from players that represents hacking attempts diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 51d27351d..437575003 100644 +index 3946ee6e5..4a3b7be2a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -57,15 +57,16 @@ index 51d27351d..437575003 100644 } } } else if ("MC|ItemName".equals(s)) { -@@ -2540,7 +2537,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2540,8 +2537,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k))); this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex)); } catch (Exception exception7) { - PlayerConnection.LOGGER.error("Couldn\'t pick item", exception7); +- this.disconnect("Invalid pick item!"); // CraftBukkit + IllegalPacketEvent.process(player.getBukkitEntity(), "InvalidPickItem", "Invalid PickItem", exception7); // Paper } } // CraftBukkit start -- -2.12.2 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch index 2fc7b2db72..5c4cd47e00 100644 --- a/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From b5ff4a771525c095c857990c97460b06d81f2b4e Mon Sep 17 00:00:00 2001 +From 9db20c658bcd925e9cb8ba9170bb2f57bedae042 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -19,10 +19,10 @@ index 58d40f994..acb4469d2 100644 public void reset() { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 437575003..7c2d43ac2 100644 +index 4a3b7be2a..d1b27c220 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2565,6 +2565,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2580,6 +2580,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit start - Add "isDisconnected" method public final boolean isDisconnected() { @@ -31,5 +31,5 @@ index 437575003..7c2d43ac2 100644 } } -- -2.12.2 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0212-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0212-Add-system-property-to-disable-book-size-limits.patch index 3b58f3fb18..c8aab88a94 100644 --- a/Spigot-Server-Patches/0212-Add-system-property-to-disable-book-size-limits.patch +++ b/Spigot-Server-Patches/0212-Add-system-property-to-disable-book-size-limits.patch @@ -1,4 +1,4 @@ -From f31346cefbd60ba0b705ca9021bda1e7e944164f Mon Sep 17 00:00:00 2001 +From 266c59f458cc4862a706054efa751b6f83c45ee5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits @@ -11,12 +11,12 @@ to make books with as much data as they want. Do not use this without limiting incoming data from packets in some other way. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index 78065e134..4e04134c0 100644 +index 5d971f07b..6a7d10344 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -37,6 +37,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { static final int MAX_PAGES = 50; - static final int MAX_PAGE_LENGTH = 256; + static final int MAX_PAGE_LENGTH = 320; // 256 limit + 64 characters to allow for psuedo colour codes static final int MAX_TITLE_LENGTH = 32; + private static final boolean OVERRIDE_CHECKS = Boolean.getBoolean("disable.book-limits"); // Paper - Add override diff --git a/work/CraftBukkit b/work/CraftBukkit index 2b6c9f40ae..6e3cec8bc7 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 2b6c9f40aef19b5366a8ecd6bf2bb9900ce3c684 +Subproject commit 6e3cec8bc78269d72ef7ef49ce82a5eadfb9615a