diff options
author | md_5 <git@md-5.net> | 2015-07-30 16:56:52 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2015-07-30 17:13:35 +1000 |
commit | 9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e (patch) | |
tree | 419daa22a7b957617c86aae6a4d26098f2157995 /nms-patches/ItemArmor.patch | |
parent | de5c26123fcb6294e77ec916d91635c3f18982ee (diff) | |
download | craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.gz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.lz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.xz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.zip |
Update for minor remapping changes.
Diffstat (limited to 'nms-patches/ItemArmor.patch')
-rw-r--r-- | nms-patches/ItemArmor.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/ItemArmor.patch b/nms-patches/ItemArmor.patch index 5dc02126..e6beb5ee 100644 --- a/nms-patches/ItemArmor.patch +++ b/nms-patches/ItemArmor.patch @@ -19,8 +19,8 @@ - ItemStack itemstack1 = itemstack.cloneItemStack(); + + // CraftBukkit start -+ ItemStack itemstack1 = itemstack.a(1); -+ World world = isourceblock.i(); ++ ItemStack itemstack1 = itemstack.cloneAndSubtract(1); ++ World world = isourceblock.getWorld(); + org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ()); + CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1); + @@ -38,8 +38,8 @@ + itemstack.count++; + // Chain to handler for new item + ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem()); -+ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.N.get(eventStack.getItem()); -+ if (idispensebehavior != IDispenseBehavior.a && idispensebehavior != this) { ++ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.REGISTRY.get(eventStack.getItem()); ++ if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != this) { + idispensebehavior.a(isourceblock, eventStack); + return itemstack; + } |