Update upstream B/CB

1 files changed, 8 insertions, 8 deletions

diff --git a/Spigot-Server-Patches/0190-IllegalPacketEvent.patch b/Spigot-Server-Patches/0190-IllegalPacketEvent.patch
index 76110f729f..121604d8d6 100644
--- a/Spigot-Server-Patches/0190-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0190-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 80e120a3ad4e27aa1ae8e4ee664b4bf1f7349ebb Mon Sep 17 00:00:00 2001
+From 8d415cbbc51eca2c8d6e90646606cca8326d13ec Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 b7e1d84d4..9214c5594 100644
+index 51d27351d..437575003 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;
@@ -17,7 +17,7 @@ index b7e1d84d4..9214c5594 100644
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -2228,8 +2229,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2236,8 +2237,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
                  }
              } catch (Exception exception) {
@@ -27,7 +27,7 @@ index b7e1d84d4..9214c5594 100644
              }
          } else {
              String s1;
-@@ -2271,8 +2271,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2286,8 +2286,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
                      }
                  } catch (Exception exception1) {
@@ -37,7 +37,7 @@ index b7e1d84d4..9214c5594 100644
                  }
              } else if ("MC|TrSel".equals(s)) {
                  try {
-@@ -2283,8 +2282,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2298,8 +2297,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          ((ContainerMerchant) container).d(j);
                      }
                  } catch (Exception exception2) {
@@ -47,7 +47,7 @@ index b7e1d84d4..9214c5594 100644
                  }
              } else {
                  TileEntity tileentity;
-@@ -2425,8 +2423,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2440,8 +2438,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                                      iinventory.update();
                                  }
                              } catch (Exception exception5) {
@@ -57,7 +57,7 @@ index b7e1d84d4..9214c5594 100644
                              }
                          }
                      } else if ("MC|ItemName".equals(s)) {
-@@ -2525,7 +2522,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2540,7 +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) {
@@ -67,5 +67,5 @@ index b7e1d84d4..9214c5594 100644
                      }
                      // CraftBukkit start
 -- 
-2.12.0.windows.1
+2.12.2.windows.2