2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ContainerBeacon.java
+++ b/net/minecraft/server/ContainerBeacon.java
2014-11-25 22:32:16 +01:00
@@ -1,11 +1,18 @@
package net.minecraft.server;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit
+
public class ContainerBeacon extends Container {
2015-07-30 08:56:52 +02:00
private IInventory beacon;
2015-02-26 23:41:06 +01:00
private final ContainerBeacon.SlotBeacon f;
2014-11-25 22:32:16 +01:00
+ // CraftBukkit start
+ private CraftInventoryView bukkitEntity = null;
+ private PlayerInventory player;
+ // CraftBukkit end
public ContainerBeacon(IInventory iinventory, IInventory iinventory1) {
+ player = (PlayerInventory) iinventory; // CraftBukkit - TODO: check this
2015-07-30 08:56:52 +02:00
this.beacon = iinventory1;
2015-02-26 23:41:06 +01:00
this.a((Slot) (this.f = new ContainerBeacon.SlotBeacon(iinventory1, 0, 136, 110)));
2014-11-25 22:32:16 +01:00
byte b0 = 36;
2015-02-26 23:41:06 +01:00
@@ -47,6 +54,7 @@
2014-11-25 22:32:16 +01:00
}
public boolean a(EntityHuman entityhuman) {
+ if (!this.checkReachable) return true; // CraftBukkit
2015-07-30 08:56:52 +02:00
return this.beacon.a(entityhuman);
2014-11-25 22:32:16 +01:00
}
2015-02-26 23:41:06 +01:00
@@ -110,4 +118,17 @@
return 1;
}
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;
+ }
+
2015-07-30 08:56:52 +02:00
+ org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryBeacon((TileEntityBeacon) this.beacon); // TODO - check this
2014-11-25 22:32:16 +01:00
+ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
+ return bukkitEntity;
+ }
+ // CraftBukkit end
}