Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-07 16:12:02 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-7794: Cancelling InventoryItemMoveEvent destroys items

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2024-06-24 20:30:28 +10:00
parent 0d64e2be4b
commit 2426828552
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityHopper.patch
View File

@ -60,12 +60,13 @@
public TileEntityHopper(BlockPosition blockposition, IBlockData iblockdata) {
super(TileEntityTypes.HOPPER, blockposition, iblockdata);
this.items = NonNullList.withSize(5, ItemStack.EMPTY);
@@ -167,7 +213,28 @@
@@ -167,7 +213,29 @@
if (!itemstack.isEmpty()) {
int j = itemstack.getCount();
- ItemStack itemstack1 = addItem(tileentityhopper, iinventory, tileentityhopper.removeItem(i, 1), enumdirection);
+ // CraftBukkit start - Call event when pushing items into other inventories
+ ItemStack original = itemstack.copy();
+ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(tileentityhopper.removeItem(i, 1));
+
+ Inventory destinationInventory;
@ -81,7 +82,7 @@
+ InventoryMoveItemEvent event = new InventoryMoveItemEvent(tileentityhopper.getOwner().getInventory(), oitemstack, destinationInventory, true);
+ world.getCraftServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ tileentityhopper.setItem(i, itemstack);
+ tileentityhopper.setItem(i, original);
+ tileentityhopper.setCooldown(8); // Delay hopper checks
+ return false;
+ }
@ -90,12 +91,13 @@
if (itemstack1.isEmpty()) {
iinventory.setChanged();
@@ -279,7 +346,33 @@
@@ -279,7 +347,34 @@
if (!itemstack.isEmpty() && canTakeItemFromContainer(ihopper, iinventory, itemstack, i, enumdirection)) {
int j = itemstack.getCount();
- ItemStack itemstack1 = addItem(iinventory, ihopper, iinventory.removeItem(i, 1), (EnumDirection) null);
+ // CraftBukkit start - Call event on collection of items from inventories into the hopper
+ ItemStack original = itemstack.copy();
+ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.removeItem(i, 1));
+
+ Inventory sourceInventory;
@ -112,7 +114,7 @@
+
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ iinventory.setItem(i, itemstack);
+ iinventory.setItem(i, original);
+
+ if (ihopper instanceof TileEntityHopper) {
+ ((TileEntityHopper) ihopper).setCooldown(8); // Delay hopper checks
@ -125,7 +127,7 @@
if (itemstack1.isEmpty()) {
iinventory.setChanged();
@@ -297,13 +390,20 @@
@@ -297,13 +392,20 @@
public static boolean addItem(IInventory iinventory, EntityItem entityitem) {
boolean flag = false;
@ -147,7 +149,7 @@
} else {
entityitem.setItem(itemstack1);
}
@@ -421,14 +521,38 @@
@@ -421,14 +523,38 @@
return itemstack;
}