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/DispenseBehaviorMonsterEgg.patch
+++ b/paper-server/nms-patches/DispenseBehaviorMonsterEgg.patch
@@ -0,0 +1,61 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/DispenseBehaviorMonsterEgg.java	2014-11-27 08:59:46.645422093 +1100
+++ src/main/java/net/minecraft/server/DispenseBehaviorMonsterEgg.java	2014-11-27 08:42:10.096851020 +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 DispenseBehaviorMonsterEgg extends DispenseBehaviorItem {
+ 
+     DispenseBehaviorMonsterEgg() {}
+@@ -9,13 +14,45 @@
+         double d0 = isourceblock.getX() + (double) enumdirection.getAdjacentX();
+         double d1 = (double) ((float) isourceblock.getBlockPosition().getY() + 0.2F);
+         double d2 = isourceblock.getZ() + (double) enumdirection.getAdjacentZ();
+-        Entity entity = ItemMonsterEgg.a(isourceblock.i(), itemstack.getData(), d0, d1, d2);
+        // Entity entity = ItemMonsterEgg.a(isourceblock.i(), itemstack.getData(), d0, d1, d2);
+        
+        // CraftBukkit start
+        World world = isourceblock.i();
+        ItemStack itemstack1 = itemstack.a(1);
+        org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
+        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
+
+        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d0, d1, d2));
+        if (!BlockDispenser.eventFired) {
+            world.getServer().getPluginManager().callEvent(event);
+        }
+
+        if (event.isCancelled()) {
+            itemstack.count++;
+            return itemstack;
+        }
+
+        if (!event.getItem().equals(craftItem)) {
+            itemstack.count++;
+            // 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;
+            }
+        }
+
+        itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
+
+        Entity entity = ItemMonsterEgg.spawnCreature(isourceblock.i(), itemstack.getData(), event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DISPENSE_EGG);
+ 
+         if (entity instanceof EntityLiving && itemstack.hasName()) {
+             ((EntityInsentient) entity).setCustomName(itemstack.getName());
+         }
+ 
+-        itemstack.a(1);
+        // itemstack.a(1); // Handled during event processing
+        // CraftBukkit end
+         return itemstack;
+     }
+ }