2014-11-28 12:23:19 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/DispenseBehaviorMinecart.java 2014-11-28 11:22:55.866823164 +0000
|
|
|
|
+++ src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java 2014-11-28 11:01:54.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -1,5 +1,10 @@
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
|
|
+import org.bukkit.event.block.BlockDispenseEvent;
|
|
|
|
+// CraftBukkit end
|
|
|
|
+
|
|
|
|
final class DispenseBehaviorMinecart extends DispenseBehaviorItem {
|
|
|
|
|
|
|
|
private final DispenseBehaviorItem b = new DispenseBehaviorItem();
|
|
|
|
@@ -38,14 +43,42 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, d0, d1 + d3, d2, ItemMinecart.a((ItemMinecart) itemstack.getItem()));
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ // EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, d0, d1 + d3, d2, ItemMinecart.a((ItemMinecart) itemstack.getItem()));
|
|
|
|
+ ItemStack itemstack1 = itemstack.a(1);
|
|
|
|
+ org.bukkit.block.Block block2 = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
|
|
|
|
+ CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
|
|
|
|
+
|
|
|
|
+ BlockDispenseEvent event = new BlockDispenseEvent(block2, craftItem.clone(), new org.bukkit.util.Vector(d0, d1 + d3, d2));
|
|
|
|
+ if (!BlockDispenser.eventFired) {
|
|
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (event.isCancelled()) {
|
|
|
|
+ itemstack.count++;
|
|
|
|
+ return itemstack;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!event.getItem().equals(craftItem)) {
|
|
|
|
+ itemstack.count++;
|
|
|
|
+ // Chain to handler for new item
|
|
|
|
+ ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
|
|
|
|
+ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.M.get(eventStack.getItem());
|
|
|
|
+ if (idispensebehavior != IDispenseBehavior.a && idispensebehavior != this) {
|
|
|
|
+ idispensebehavior.a(isourceblock, eventStack);
|
|
|
|
+ return itemstack;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
|
|
|
|
+ EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), ItemMinecart.a((ItemMinecart) itemstack1.getItem()));
|
|
|
|
|
|
|
|
if (itemstack.hasName()) {
|
|
|
|
entityminecartabstract.setCustomName(itemstack.getName());
|
|
|
|
}
|
|
|
|
|
|
|
|
world.addEntity(entityminecartabstract);
|
|
|
|
- itemstack.a(1);
|
|
|
|
+ // itemstack.a(1); // CraftBukkit - handled during event processing
|
|
|
|
return itemstack;
|
|
|
|
}
|
|
|
|
|