summaryrefslogtreecommitdiffstats
path: root/nms-patches/ContainerBrewingStand.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/ContainerBrewingStand.patch')
-rw-r--r--nms-patches/ContainerBrewingStand.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/nms-patches/ContainerBrewingStand.patch b/nms-patches/ContainerBrewingStand.patch
index cdccd70b..3541c8fa 100644
--- a/nms-patches/ContainerBrewingStand.patch
+++ b/nms-patches/ContainerBrewingStand.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/ContainerBrewingStand.java 2014-11-28 17:43:42.997707437 +0000
-+++ src/main/java/net/minecraft/server/ContainerBrewingStand.java 2014-11-28 17:38:21.000000000 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/ContainerBrewingStand.java 2015-02-26 22:40:22.379608142 +0000
++++ src/main/java/net/minecraft/server/ContainerBrewingStand.java 2015-02-26 22:40:22.383608142 +0000
@@ -1,12 +1,23 @@
package net.minecraft.server;
@@ -13,17 +13,17 @@
private IInventory brewingStand;
private final Slot f;
private int g;
-+
+
+ // CraftBukkit start
+ private CraftInventoryView bukkitEntity = null;
+ private PlayerInventory player;
+ // CraftBukkit end
-
++
public ContainerBrewingStand(PlayerInventory playerinventory, IInventory iinventory) {
+ player = playerinventory; // CraftBukkit
this.brewingStand = iinventory;
- this.a((Slot) (new SlotPotionBottle(playerinventory.player, iinventory, 0, 56, 46)));
- this.a((Slot) (new SlotPotionBottle(playerinventory.player, iinventory, 1, 79, 53)));
+ this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(playerinventory.player, iinventory, 0, 56, 46)));
+ this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(playerinventory.player, iinventory, 1, 79, 53)));
@@ -47,6 +58,7 @@
}
@@ -32,11 +32,11 @@
return this.brewingStand.a(entityhuman);
}
-@@ -101,4 +113,17 @@
-
- return itemstack;
+@@ -146,4 +158,17 @@
+ return itemstack != null && (itemstack.getItem() == Items.POTION || itemstack.getItem() == Items.GLASS_BOTTLE);
+ }
}
-+
++
+ // CraftBukkit start
+ @Override
+ public CraftInventoryView getBukkitView() {