From 2a773b737b3b640ebb3a5a4032664eaf9e152a50 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 11 Jun 2016 14:58:54 -0500 Subject: [PATCH] Update upstream and rebuild --- .../Reimplement-PlayerEditBookEvent.patch | 59 ------------------- work/CraftBukkit | 2 +- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 Spigot-Server-Patches/Reimplement-PlayerEditBookEvent.patch diff --git a/Spigot-Server-Patches/Reimplement-PlayerEditBookEvent.patch b/Spigot-Server-Patches/Reimplement-PlayerEditBookEvent.patch deleted file mode 100644 index c441b7e696..0000000000 --- a/Spigot-Server-Patches/Reimplement-PlayerEditBookEvent.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: willies952002 <admin@domnian.com> -Date: Sat, 23 Apr 2016 19:51:19 -0400 -Subject: [PATCH] Reimplement PlayerEditBookEvent - - -diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 { - - if (itemstack.getItem() == Items.WRITABLE_BOOK && itemstack.getItem() == itemstack1.getItem()) { - itemstack1.a("pages", (NBTBase) itemstack.getTag().getList("pages", 8)); -+ CraftEventFactory.handleEditBookEvent(player, itemstack1); // Paper - } - } catch (Exception exception) { - PlayerConnection.LOGGER.error("Couldn\'t handle book info", exception); -+ this.disconnect("Invalid Book Data!"); // Paper - } - } else { - String s1; -@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { - - itemstack1.a("pages", (NBTBase) nbttaglist); - itemstack1.setItem(Items.WRITTEN_BOOK); -+ CraftEventFactory.handleEditBookEvent(player, itemstack1); // Paper - } - } catch (Exception exception1) { - PlayerConnection.LOGGER.error("Couldn\'t sign book", exception1); -+ this.disconnect("Invalid Book Data!"); // Paper - } - } else if ("MC|TrSel".equals(s)) { - try { -@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { - } - } catch (Exception exception3) { - PlayerConnection.LOGGER.error("Couldn\'t set command block", exception3); -+ this.disconnect("Invalid Command Block Data!"); // Paper - } - } else if ("MC|AutoCmd".equals(s)) { - if (!this.minecraftServer.getEnableCommandBlock()) { -@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { - } - } catch (Exception exception4) { - PlayerConnection.LOGGER.error("Couldn\'t set command block", exception4); -+ this.disconnect("Invalid Command Block Data!"); // Paper - } - } else { - int k; -@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { - } - } catch (Exception exception5) { - PlayerConnection.LOGGER.error("Couldn\'t set beacon", exception5); -+ this.disconnect("Invalid Beacon Data!"); // Paper - } - } - } else if ("MC|ItemName".equals(s)) { --- \ No newline at end of file diff --git a/work/CraftBukkit b/work/CraftBukkit index 10c10b3124..d5ecbd0e93 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 10c10b3124020862b6e912c63938a337dda693fe +Subproject commit d5ecbd0e93a7a22d3631541c258635fdcc42a489