Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.5

Browse Source
This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java
View File

@@ -5,23 +5,18 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.event.block.BlockDispenseEvent;
// CraftBukkit end
public class DispenseBehaviorFilledBucket extends DispenseBehaviorItem {
final class DispenseBehaviorFilledBucket extends DispenseBehaviorItem {
private final DispenseBehaviorItem c;
private final DispenseBehaviorItem b = new DispenseBehaviorItem();
final MinecraftServer b;
public DispenseBehaviorFilledBucket(MinecraftServer minecraftserver) {
this.b = minecraftserver;
this.c = 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 = EnumFacing.a(isourceblock.h());
EnumFacing enumfacing = BlockDispenser.j_(isourceblock.h());
// CraftBukkit start
World world = isourceblock.k();
@@ -61,13 +56,13 @@ public class DispenseBehaviorFilledBucket extends DispenseBehaviorItem {
itemstack.id = item.id;
itemstack.count = 1;
} else if (((TileEntityDispenser) isourceblock.getTileEntity()).addItem(new ItemStack(item)) < 0) {
this.c.a(isourceblock, new ItemStack(item));
this.b.a(isourceblock, new ItemStack(item));
}
// CraftBukkit end
return itemstack;
} else {
return this.c.a(isourceblock, itemstack);
return this.b.a(isourceblock, itemstack);
}
}
}