Update to Minecraft 1.8

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

1 files changed, 29 insertions, 0 deletions

diff --git a/nms-patches/EntityPig.patch b/nms-patches/EntityPig.patch
new file mode 100644
index 00000000..064655a7
--- /dev/null
+++ b/nms-patches/EntityPig.patch
@@ -0,0 +1,29 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/EntityPig.java	2014-11-27 08:59:46.717421776 +1100
++++ src/main/java/net/minecraft/server/EntityPig.java	2014-11-27 08:42:10.140850934 +1100
+@@ -1,5 +1,7 @@
+ package net.minecraft.server;
+ 
++import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
++
+ public class EntityPig extends EntityAnimal {
+ 
+     private final PathfinderGoalPassengerCarrotStick bk;
+@@ -111,10 +113,17 @@
+     public void onLightningStrike(EntityLightning entitylightning) {
+         if (!this.world.isStatic) {
+             EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
++ 
++            // CraftBukkit start
++            if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
++                return;
++            }
++            // CraftBukkit end
+ 
+             entitypigzombie.setEquipment(0, new ItemStack(Items.GOLDEN_SWORD));
+             entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
+-            this.world.addEntity(entitypigzombie);
++            // CraftBukkit - added a reason for spawning this creature
++            this.world.addEntity(entitypigzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);
+             this.die();
+         }
+     }