2014-11-29 00:02:15 +01:00
|
|
|
--- ../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
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -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();
|
|
|
|
|
}
|
|
|
|
|
}
|
