Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/

1 files changed, 47 insertions, 0 deletions

diff --git a/nms-patches/ContainerBeacon.patch b/nms-patches/ContainerBeacon.patch
new file mode 100644
index 00000000..178e143c
--- /dev/null
+++ b/nms-patches/ContainerBeacon.patch
@@ -0,0 +1,47 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/ContainerBeacon.java	2014-11-27 08:59:46.601422287 +1100
++++ src/main/java/net/minecraft/server/ContainerBeacon.java	2014-11-27 08:42:10.156850903 +1100
+@@ -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
+ }