Update upstream CB

This commit is contained in:
Zach Brown
2017-05-13 20:37:46 -05:00
parent c480f39ff9
commit 2c33c8b106
4 changed files with 6 additions and 5 deletions

View File

@@ -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
@@ -0,0 +0,0 @@ import org.bukkit.inventory.CraftingInventory;
@@ -62,6 +62,7 @@ index 51d27351d..437575003 100644
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
}
}