diff options
Diffstat (limited to 'nms-patches/TileEntityBrewingStand.patch')
| -rw-r--r-- | nms-patches/TileEntityBrewingStand.patch | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/nms-patches/TileEntityBrewingStand.patch b/nms-patches/TileEntityBrewingStand.patch index fcd716ab..012112d5 100644 --- a/nms-patches/TileEntityBrewingStand.patch +++ b/nms-patches/TileEntityBrewingStand.patch @@ -1,6 +1,6 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/TileEntityBrewingStand.java 2014-11-28 17:43:43.389707429 +0000 -+++ src/main/java/net/minecraft/server/TileEntityBrewingStand.java 2014-11-28 17:38:23.000000000 +0000 -@@ -3,6 +3,12 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/TileEntityBrewingStand.java 2015-02-26 22:40:23.123608134 +0000 ++++ src/main/java/net/minecraft/server/TileEntityBrewingStand.java 2015-02-26 22:40:23.123608134 +0000 +@@ -3,18 +3,50 @@ import java.util.Arrays; import java.util.List; @@ -13,15 +13,17 @@ public class TileEntityBrewingStand extends TileEntityContainer implements IUpdatePlayerListBox, IWorldInventory { private static final int[] a = new int[] { 3}; -@@ -12,8 +18,35 @@ + private static final int[] f = new int[] { 0, 1, 2}; + private ItemStack[] items = new ItemStack[4]; +- private int brewTime; ++ public int brewTime; // CraftBukkit - public private boolean[] i; private Item j; private String k; + private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field public TileEntityBrewingStand() {} -+ -+ + + // CraftBukkit start - add fields and methods + public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>(); + private int maxStack = 64; @@ -46,10 +48,11 @@ + maxStack = size; + } + // CraftBukkit end - ++ public String getName() { return this.hasCustomName() ? this.k : "container.brewing"; -@@ -32,9 +65,14 @@ + } +@@ -32,9 +64,14 @@ } public void c() { @@ -66,11 +69,10 @@ this.o(); this.update(); } else if (!this.n()) { -@@ -109,6 +147,16 @@ - private void o() { +@@ -110,6 +147,16 @@ if (this.n()) { ItemStack itemstack = this.items[3]; -+ + + // CraftBukkit start + if (getOwner() != null) { + BrewEvent event = new BrewEvent(world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), (org.bukkit.inventory.BrewerInventory) this.getOwner().getInventory()); @@ -80,10 +82,11 @@ + } + } + // CraftBukkit end - ++ for (int i = 0; i < 3; ++i) { if (this.items[i] != null && this.items[i].getItem() == Items.POTION) { -@@ -221,7 +269,7 @@ + int j = this.items[i].getData(); +@@ -221,7 +268,7 @@ } public int getMaxStackSize() { |