Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/ By: Thinkofdeath <thinkofdeath@spigotmc.org>
2014-11-26 08:32:16 +11:00
parent 2f44d66966
commit a419776f3c
347 changed files with 22151 additions and 1209 deletions
--- a/paper-server/nms-patches/ContainerDispenser.patch
+++ b/paper-server/nms-patches/ContainerDispenser.patch
@@ -0,0 +1,54 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/ContainerDispenser.java	2014-11-27 08:59:46.605422269 +1100
+++ src/main/java/net/minecraft/server/ContainerDispenser.java	2014-11-27 08:42:10.148850918 +1100
+@@ -1,11 +1,24 @@
+ package net.minecraft.server;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftInventory;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+// CraftBukkit end
+
+ public class ContainerDispenser extends Container {
+ 
+-    private IInventory items;
+    public IInventory items; // CraftBukkit - private -> public
+    // CraftBukkit start
+    private CraftInventoryView bukkitEntity = null;
+    private PlayerInventory player;
+    // CraftBukkit end
+ 
+     public ContainerDispenser(IInventory iinventory, IInventory iinventory1) {
+         this.items = iinventory1;
+        // CraftBukkit start - Save player
+        // TODO: Should we check to make sure it really is an InventoryPlayer?
+        this.player = (PlayerInventory)iinventory;
+        // CraftBukkit end
+ 
+         int i;
+         int j;
+@@ -29,6 +42,7 @@
+     }
+ 
+     public boolean a(EntityHuman entityhuman) {
+        if (!this.checkReachable) return true; // CraftBukkit
+         return this.items.a(entityhuman);
+     }
+ 
+@@ -63,4 +77,17 @@
+ 
+         return itemstack;
+     }
+
+    // CraftBukkit start
+    @Override
+    public CraftInventoryView getBukkitView() {
+        if (bukkitEntity != null) {
+            return bukkitEntity;
+        }
+
+        CraftInventory inventory = new CraftInventory(this.items);
+        bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
+        return bukkitEntity;
+    }
+    // CraftBukkit end
+ }