From 24557bc2b37deb6a0edf497d547471832457b1dd Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 26 Nov 2014 08:32:16 +1100 Subject: Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/ --- .../server/DispenseBehaviorFilledBucket.java | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java (limited to 'src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java') diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java b/src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java deleted file mode 100644 index 4a3691a1..00000000 --- a/src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.minecraft.server; - -// CraftBukkit start -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.event.block.BlockDispenseEvent; -// CraftBukkit end - -final class DispenseBehaviorFilledBucket extends DispenseBehaviorItem { - - private final DispenseBehaviorItem b = new DispenseBehaviorItem(); - - DispenseBehaviorFilledBucket() {} - - public ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { - ItemBucket itembucket = (ItemBucket) itemstack.getItem(); - int i = isourceblock.getBlockX(); - int j = isourceblock.getBlockY(); - int k = isourceblock.getBlockZ(); - EnumFacing enumfacing = BlockDispenser.b(isourceblock.h()); - - // CraftBukkit start - World world = isourceblock.k(); - int x = i + enumfacing.getAdjacentX(); - int y = j + enumfacing.getAdjacentY(); - int z = k + enumfacing.getAdjacentZ(); - if (world.isEmpty(x, y, z) || !world.getType(x, y, z).getMaterial().isBuildable()) { - org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k); - CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack); - - BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(x, y, z)); - if (!BlockDispenser.eventFired) { - world.getServer().getPluginManager().callEvent(event); - } - - if (event.isCancelled()) { - return itemstack; - } - - if (!event.getItem().equals(craftItem)) { - // Chain to handler for new item - ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem()); - IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.a.get(eventStack.getItem()); - if (idispensebehavior != IDispenseBehavior.a && idispensebehavior != this) { - idispensebehavior.a(isourceblock, eventStack); - return itemstack; - } - } - - itembucket = (ItemBucket) CraftItemStack.asNMSCopy(event.getItem()).getItem(); - } - // CraftBukkit end - - if (itembucket.a(isourceblock.k(), i + enumfacing.getAdjacentX(), j + enumfacing.getAdjacentY(), k + enumfacing.getAdjacentZ())) { - // CraftBukkit start - Handle stacked buckets - Item item = Items.BUCKET; - if (--itemstack.count == 0) { - itemstack.setItem(Items.BUCKET); - itemstack.count = 1; - } else if (((TileEntityDispenser) isourceblock.getTileEntity()).addItem(new ItemStack(item)) < 0) { - this.b.a(isourceblock, new ItemStack(item)); - } - // CraftBukkit end - - return itemstack; - } else { - return this.b.a(isourceblock, itemstack); - } - } -} -- cgit v1.2.3