Entonez/KCauldronX
1
0
Fork 0
forked from xjboss/KCauldronX
Code Releases Activity

Implement Bukkit's inventory for modded inventories, fix #257

Browse Source
This commit is contained in:
Sergey Shatunov
2016-02-01 04:54:40 +07:00
parent e3bc245aa4
commit 6c2be10dc9
4 changed files with 165 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/net/minecraft/tileentity/TileEntityHopper.java.patch
View File

@ -149,14 +149,14 @@
return false;
}
}
@@ -427,11 +526,70 @@
@@ -427,11 +526,66 @@
if (itemstack != null && func_145890_b(p_145892_1_, itemstack, p_145892_2_, p_145892_3_))
{
ItemStack itemstack1 = itemstack.copy();
- ItemStack itemstack2 = func_145889_a(p_145892_0_, p_145892_1_.decrStackSize(p_145892_2_, 1), -1);
+ // CraftBukkit start - Call event on collection of items from inventories into the hopper
+ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(p_145892_1_.decrStackSize(p_145892_2_, 1));
+ Inventory sourceInventory;
+ Inventory sourceInventory = null;
+ // Have to special case large chests as they work oddly
+ if (p_145892_1_ instanceof InventoryLargeChest)
@ -172,15 +172,11 @@
+ {
+ sourceInventory = p_145892_1_.getOwner().getInventory();
+ }
+ else
+ {
+ // TODO: create a mod inventory for passing to the event, instead of null
+ sourceInventory = null;
+ }
+ }
+ catch (AbstractMethodError e)
+ {
+ sourceInventory = null;
+ {} finally {
+ if (sourceInventory == null)
+ sourceInventory = new kcauldron.CraftInventoryWrapper(p_145892_1_);
+ }
+ // Cauldron end
+ }
@ -222,7 +218,7 @@
return true;
}
@@ -451,6 +609,20 @@
@@ -451,6 +605,20 @@
}
else
{