Paper/nms-patches/ItemArmor.patch

59 lines
2.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ItemArmor.java
+++ b/net/minecraft/server/ItemArmor.java
2016-02-29 22:32:46 +01:00
@@ -5,6 +5,11 @@
2015-02-26 23:41:06 +01:00
import java.util.List;
2016-02-29 22:32:46 +01:00
import java.util.UUID;
2015-02-26 23:41:06 +01:00
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.block.BlockDispenseEvent;
+// CraftBukkit end
+
public class ItemArmor extends Item {
2016-03-30 21:50:59 +02:00
private static final int[] n = new int[] { 13, 15, 16, 11};
@@ -36,7 +41,33 @@
2016-02-29 22:32:46 +01:00
} else {
EntityLiving entityliving = (EntityLiving) list.get(0);
EnumItemSlot enumitemslot = EntityInsentient.d(itemstack);
- ItemStack itemstack1 = itemstack.cloneItemStack();
+ // CraftBukkit start
+ 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);
2015-02-26 23:41:06 +01:00
+
2016-02-29 22:32:46 +01:00
+ BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
+ if (!BlockDispenser.eventFired) {
+ world.getServer().getPluginManager().callEvent(event);
+ }
2015-02-26 23:41:06 +01:00
+
2016-02-29 22:32:46 +01:00
+ if (event.isCancelled()) {
+ itemstack.count++;
+ return itemstack;
+ }
2015-02-26 23:41:06 +01:00
+
2016-02-29 22:32:46 +01:00
+ if (!event.getItem().equals(craftItem)) {
+ itemstack.count++;
+ // Chain to handler for new item
+ ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
+ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.REGISTRY.get(eventStack.getItem());
+ if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != ItemArmor.b) {
+ idispensebehavior.a(isourceblock, eventStack);
2015-02-26 23:41:06 +01:00
+ return itemstack;
+ }
2016-02-29 22:32:46 +01:00
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
2016-02-29 22:32:46 +01:00
itemstack1.count = 1;
entityliving.setSlot(enumitemslot, itemstack1);
2016-03-30 21:50:59 +02:00
@@ -44,7 +75,7 @@
2016-02-29 22:32:46 +01:00
((EntityInsentient) entityliving).a(enumitemslot, 2.0F);
}
2015-02-26 23:41:06 +01:00
2016-02-29 22:32:46 +01:00
- --itemstack.count;
+ // --itemstack.count; // CraftBukkit - handled above
return itemstack;
}
}