mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-25 02:17:35 +01:00
094bb03a37
- Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
73 lines
4.2 KiB
Diff
73 lines
4.2 KiB
Diff
From d515cb2947636628e6f0f272a72a73fc0d03b5c5 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 23 Jun 2016 23:33:57 -0400
|
|
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 0191a9af2..45a50602b 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;
|
|
import org.bukkit.inventory.EquipmentSlot;
|
|
import org.bukkit.inventory.InventoryView;
|
|
import org.bukkit.util.NumberConversions;
|
|
+import com.destroystokyo.paper.event.player.IllegalPacketEvent; // Paper
|
|
import co.aikar.timings.MinecraftTimings; // Paper
|
|
// CraftBukkit end
|
|
|
|
@@ -2288,8 +2289,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
|
|
}
|
|
} catch (Exception exception) {
|
|
- PlayerConnection.LOGGER.error("Couldn\'t handle book info", exception);
|
|
- this.disconnect("Invalid book data!"); // CraftBukkit
|
|
+ IllegalPacketEvent.process(player.getBukkitEntity(), "InvalidBookEdit", "Invalid book data!", exception); // Paper
|
|
}
|
|
} else {
|
|
String s1;
|
|
@@ -2338,8 +2338,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
|
|
}
|
|
} catch (Exception exception1) {
|
|
- PlayerConnection.LOGGER.error("Couldn\'t sign book", exception1);
|
|
- this.disconnect("Invalid book data!"); // CraftBukkit
|
|
+ IllegalPacketEvent.process(player.getBukkitEntity(), "InvalidBookSign", "Invalid book data!", exception1); // Paper
|
|
}
|
|
} else if ("MC|TrSel".equals(s)) {
|
|
try {
|
|
@@ -2350,8 +2349,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
((ContainerMerchant) container).d(j);
|
|
}
|
|
} catch (Exception exception2) {
|
|
- PlayerConnection.LOGGER.error("Couldn\'t select trade", exception2);
|
|
- this.disconnect("Invalid trade data!"); // CraftBukkit
|
|
+ IllegalPacketEvent.process(player.getBukkitEntity(), "InvalidTrade", "Invalid trade data!", exception2); // Paper
|
|
}
|
|
} else {
|
|
TileEntity tileentity;
|
|
@@ -2492,8 +2490,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
iinventory.update();
|
|
}
|
|
} catch (Exception exception5) {
|
|
- PlayerConnection.LOGGER.error("Couldn\'t set beacon", exception5);
|
|
- this.disconnect("Invalid beacon data!"); // CraftBukkit
|
|
+ IllegalPacketEvent.process(player.getBukkitEntity(), "InvalidBeacon", "Invalid beacon data!", exception5); // Paper
|
|
}
|
|
}
|
|
} else if ("MC|ItemName".equals(s)) {
|
|
@@ -2592,8 +2589,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.16.1
|
|
|