diff options
Diffstat (limited to 'nms-patches/EntityPig.patch')
| -rw-r--r-- | nms-patches/EntityPig.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/nms-patches/EntityPig.patch b/nms-patches/EntityPig.patch index a24a5846..ba054dda 100644 --- a/nms-patches/EntityPig.patch +++ b/nms-patches/EntityPig.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/EntityPig.java 2014-11-28 17:43:43.145707434 +0000 -+++ src/main/java/net/minecraft/server/EntityPig.java 2014-11-28 17:38:23.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/EntityPig.java 2015-02-26 22:40:22.647608139 +0000 ++++ src/main/java/net/minecraft/server/EntityPig.java 2015-02-26 22:40:22.647608139 +0000 @@ -1,5 +1,7 @@ package net.minecraft.server; @@ -7,20 +7,24 @@ + public class EntityPig extends EntityAnimal { - private final PathfinderGoalPassengerCarrotStick bk; -@@ -111,10 +113,17 @@ - public void onLightningStrike(EntityLightning entitylightning) { - if (!this.world.isStatic) { + private final PathfinderGoalPassengerCarrotStick bm; +@@ -112,6 +114,12 @@ + if (!this.world.isClientSide && !this.dead) { 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); + entitypigzombie.k(this.ce()); +@@ -120,7 +128,8 @@ + entitypigzombie.setCustomNameVisible(this.getCustomNameVisible()); + } + - this.world.addEntity(entitypigzombie); + // CraftBukkit - added a reason for spawning this creature + this.world.addEntity(entitypigzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); |