mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +01:00
90ac03522a
This reverts commit d6e3dff7d8
.
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
--- ../work/decompile-8eb82bde//net/minecraft/server/ContainerBeacon.java 2014-11-28 17:43:42.997707437 +0000
|
|
+++ src/main/java/net/minecraft/server/ContainerBeacon.java 2014-11-28 17:38:18.000000000 +0000
|
|
@@ -1,11 +1,18 @@
|
|
package net.minecraft.server;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit
|
|
+
|
|
public class ContainerBeacon extends Container {
|
|
|
|
private IInventory a;
|
|
private final SlotBeacon f;
|
|
+ // CraftBukkit start
|
|
+ private CraftInventoryView bukkitEntity = null;
|
|
+ private PlayerInventory player;
|
|
+ // CraftBukkit end
|
|
|
|
public ContainerBeacon(IInventory iinventory, IInventory iinventory1) {
|
|
+ player = (PlayerInventory) iinventory; // CraftBukkit - TODO: check this
|
|
this.a = iinventory1;
|
|
this.a((Slot) (this.f = new SlotBeacon(this, iinventory1, 0, 136, 110)));
|
|
byte b0 = 36;
|
|
@@ -35,6 +42,7 @@
|
|
}
|
|
|
|
public boolean a(EntityHuman entityhuman) {
|
|
+ if (!this.checkReachable) return true; // CraftBukkit
|
|
return this.a.a(entityhuman);
|
|
}
|
|
|
|
@@ -83,4 +91,17 @@
|
|
|
|
return itemstack;
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ @Override
|
|
+ public CraftInventoryView getBukkitView() {
|
|
+ if (bukkitEntity != null) {
|
|
+ return bukkitEntity;
|
|
+ }
|
|
+
|
|
+ org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryBeacon((TileEntityBeacon) this.a); // TODO - check this
|
|
+ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
|
|
+ return bukkitEntity;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|