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/DispenseBehaviorEmptyBucket.patch
+++ b/paper-server/nms-patches/DispenseBehaviorEmptyBucket.patch
@@ -0,0 +1,44 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/DispenseBehaviorEmptyBucket.java	2014-11-27 08:59:46.633422146 +1100
+++ src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java	2014-11-27 08:42:10.124850965 +1100
+@@ -1,5 +1,10 @@
+ package net.minecraft.server;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.block.BlockDispenseEvent;
+// CraftBukkit end
+
+ final class DispenseBehaviorEmptyBucket extends DispenseBehaviorItem {
+ 
+     private final DispenseBehaviorItem b = new DispenseBehaviorItem();
+@@ -23,6 +28,30 @@
+ 
+             item = Items.LAVA_BUCKET;
+         }
+        
+        // CraftBukkit start
+        org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
+        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
+
+        BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
+        if (!BlockDispenser.eventFired) {
+            world.getServer().getPluginManager().callEvent(event);
+        }
+
+        if (event.isCancelled()) {
+            return itemstack;
+        }
+
+        if (!event.getItem().equals(craftItem)) {
+            // Chain to handler for new item
+            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.M.get(eventStack.getItem());
+            if (idispensebehavior != IDispenseBehavior.a && idispensebehavior != this) {
+                idispensebehavior.a(isourceblock, eventStack);
+                return itemstack;
+            }
+        }
+        // CraftBukkit end
+ 
+         world.setAir(blockposition);
+         if (--itemstack.count == 0) {