geforkt von Mirrors/Paper
53 Zeilen
1.9 KiB
Diff
53 Zeilen
1.9 KiB
Diff
--- /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;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryBrewer;
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
|
|
+// CraftBukkit end
|
|
+
|
|
public class ContainerBrewingStand extends Container {
|
|
|
|
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 ContainerBrewingStand.SlotPotionBottle(playerinventory.player, iinventory, 0, 56, 46)));
|
|
this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(playerinventory.player, iinventory, 1, 79, 53)));
|
|
@@ -47,6 +58,7 @@
|
|
}
|
|
|
|
public boolean a(EntityHuman entityhuman) {
|
|
+ if (!this.checkReachable) return true; // CraftBukkit
|
|
return this.brewingStand.a(entityhuman);
|
|
}
|
|
|
|
@@ -146,4 +158,17 @@
|
|
return itemstack != null && (itemstack.getItem() == Items.POTION || itemstack.getItem() == Items.GLASS_BOTTLE);
|
|
}
|
|
}
|
|
+
|
|
+ // 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
|
|
}
|