From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: RodneyMKay <36546810+RodneyMKay@users.noreply.github.com> Date: Wed, 8 Sep 2021 21:34:01 +0200 Subject: [PATCH] Add PlayerPickItemEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java index ffa4cee256c387b1ef8489b931cd3aefeaa6f9f4..34fcdeb0f4039f1fc6c4c8c593cc615560af1ba2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -942,7 +942,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.disconnect("Invalid hotbar selection (Hacking?)", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause return; } - this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed + Player bukkitPlayer = this.player.getBukkitEntity(); + int targetSlot = this.player.getInventory().getSuitableHotbarSlot(); + int sourceSlot = packet.getSlot(); + + io.papermc.paper.event.player.PlayerPickItemEvent event = new io.papermc.paper.event.player.PlayerPickItemEvent(bukkitPlayer, targetSlot, sourceSlot); + if (!event.callEvent()) return; + + this.player.getInventory().pickSlot(event.getSourceSlot(), event.getTargetSlot()); // Paper end this.player.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, this.player.getInventory().selected, this.player.getInventory().getItem(this.player.getInventory().selected))); this.player.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, packet.getSlot(), this.player.getInventory().getItem(packet.getSlot()))); diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java index 395cecc385e4126a7534ac9aeb15cf323efab03e..96d664c28738d6090f7067761c2978dd1aa0fd0e 100644 --- a/src/main/java/net/minecraft/world/entity/player/Inventory.java +++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java @@ -174,7 +174,13 @@ public class Inventory implements Container, Nameable { } public void pickSlot(int slot) { - this.selected = this.getSuitableHotbarSlot(); + // Paper start - Add PlayerPickItemEvent + pickSlot(slot, this.getSuitableHotbarSlot()); + } + + public void pickSlot(int slot, int targetSlot) { + this.selected = targetSlot; + // Paper end ItemStack itemstack = (ItemStack) this.items.get(this.selected); this.items.set(this.selected, (ItemStack) this.items.get(slot));