2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/ContainerBrewingStand.java
|
|
|
|
+++ b/net/minecraft/server/ContainerBrewingStand.java
|
2016-11-17 02:41:03 +01:00
|
|
|
@@ -1,5 +1,10 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryBrewer;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
|
|
|
|
+// CraftBukkit end
|
2016-11-17 02:41:03 +01:00
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
public class ContainerBrewingStand extends Container {
|
|
|
|
|
2016-11-17 02:41:03 +01:00
|
|
|
private final IInventory brewingStand;
|
|
|
|
@@ -7,7 +12,13 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
private int g;
|
2016-02-29 22:32:46 +01:00
|
|
|
private int h;
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start
|
|
|
|
+ private CraftInventoryView bukkitEntity = null;
|
|
|
|
+ private PlayerInventory player;
|
|
|
|
+ // CraftBukkit end
|
2015-02-26 23:41:06 +01:00
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
public ContainerBrewingStand(PlayerInventory playerinventory, IInventory iinventory) {
|
|
|
|
+ player = playerinventory; // CraftBukkit
|
|
|
|
this.brewingStand = iinventory;
|
2017-05-19 13:00:13 +02:00
|
|
|
this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(iinventory, 0, 56, 51)));
|
|
|
|
this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(iinventory, 1, 79, 58)));
|
2016-11-17 02:41:03 +01:00
|
|
|
@@ -54,6 +65,7 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean a(EntityHuman entityhuman) {
|
|
|
|
+ if (!this.checkReachable) return true; // CraftBukkit
|
|
|
|
return this.brewingStand.a(entityhuman);
|
|
|
|
}
|
|
|
|
|
2017-05-19 13:00:13 +02:00
|
|
|
@@ -178,4 +190,17 @@
|
2016-11-17 02:41:03 +01:00
|
|
|
return item == Items.POTION || item == Items.SPLASH_POTION || item == Items.LINGERING_POTION || item == Items.GLASS_BOTTLE;
|
2015-02-26 23:41:06 +01:00
|
|
|
}
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
2015-02-26 23:41:06 +01:00
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start
|
|
|
|
+ @Override
|
|
|
|
+ public CraftInventoryView getBukkitView() {
|
|
|
|
+ if (bukkitEntity != null) {
|
|
|
|
+ return bukkitEntity;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ CraftInventoryBrewer inventory = new CraftInventoryBrewer(this.brewingStand);
|
|
|
|
+ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
|
|
|
|
+ return bukkitEntity;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
}
|