xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

修复的可能造成负数物品的一些问题代码

Browse Source
This commit is contained in:
聪聪
2017-07-17 07:20:24 +08:00
parent dfb695724b
commit 7bbc071d49
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/net/minecraft/block/BlockDispenser.java.patch
View File

@ -18,11 +18,13 @@
{
BlockSourceImpl blocksourceimpl = new BlockSourceImpl(p_149941_1_, p_149941_2_, p_149941_3_, p_149941_4_);
TileEntityDispenser tileentitydispenser = (TileEntityDispenser)blocksourceimpl.getBlockTileEntity();
@@ -145,6 +147,7 @@
@@ -145,7 +147,8 @@
if (ibehaviordispenseitem != IBehaviorDispenseItem.itemDispenseBehaviorProvider)
{
ItemStack itemstack1 = ibehaviordispenseitem.dispense(blocksourceimpl, itemstack);
- tileentitydispenser.setInventorySlotContents(l, itemstack1.stackSize == 0 ? null : itemstack1);
+ eventFired = false; // CraftBukkit - reset event status
tileentitydispenser.setInventorySlotContents(l, itemstack1.stackSize == 0 ? null : itemstack1);
+ tileentitydispenser.setInventorySlotContents(l, itemstack1.stackSize <= 0 ? null : itemstack1);
}
}
}

17
patches/net/minecraft/block/BlockDropper.java.patch
View File

@ -21,7 +21,7 @@
{
BlockSourceImpl blocksourceimpl = new BlockSourceImpl(p_149941_1_, p_149941_2_, p_149941_3_, p_149941_4_);
TileEntityDispenser tileentitydispenser = (TileEntityDispenser)blocksourceimpl.getBlockTileEntity();
@@ -60,10 +65,33 @@
@@ -60,13 +65,36 @@
if (iinventory != null)
{
@ -56,4 +56,17 @@
+ // CraftBukkit end
itemstack1 = itemstack.copy();
if (--itemstack1.stackSize == 0)
- if (--itemstack1.stackSize == 0)
+ if (--itemstack1.stackSize <= 0)
{
itemstack1 = null;
}
@@ -80,7 +108,7 @@
{
itemstack1 = this.field_149947_P.dispense(blocksourceimpl, itemstack);
- if (itemstack1 != null && itemstack1.stackSize == 0)
+ if (itemstack1 != null && itemstack1.stackSize <= 0)
{
itemstack1 = null;
}