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/ContainerBrewingStand.patch
+++ b/paper-server/nms-patches/ContainerBrewingStand.patch
@@ -0,0 +1,52 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/ContainerBrewingStand.java	2014-11-27 08:59:46.605422269 +1100
+++ src/main/java/net/minecraft/server/ContainerBrewingStand.java	2014-11-27 08:42:10.172850872 +1100
+@@ -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 SlotPotionBottle(playerinventory.player, iinventory, 0, 56, 46)));
+         this.a((Slot) (new 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);
+     }
+ 
+@@ -101,4 +113,17 @@
+ 
+         return itemstack;
+     }
+    
+    // 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
+ }