2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/EntityPig.java
|
|
|
|
+++ b/net/minecraft/server/EntityPig.java
|
2016-05-10 13:47:39 +02:00
|
|
|
@@ -5,6 +5,8 @@
|
2016-02-29 22:32:46 +01:00
|
|
|
import java.util.Set;
|
2016-05-10 13:47:39 +02:00
|
|
|
import javax.annotation.Nullable;
|
2014-11-25 22:32:16 +01:00
|
|
|
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
|
|
+
|
|
|
|
public class EntityPig extends EntityAnimal {
|
|
|
|
|
2016-11-17 02:41:03 +01:00
|
|
|
private static final DataWatcherObject<Boolean> bw = DataWatcher.a(EntityPig.class, DataWatcherRegistry.h);
|
2016-12-20 21:00:00 +01:00
|
|
|
@@ -156,6 +158,12 @@
|
2015-02-26 23:41:06 +01:00
|
|
|
if (!this.world.isClientSide && !this.dead) {
|
2014-11-25 22:32:16 +01:00
|
|
|
EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start
|
|
|
|
+ if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2015-02-26 23:41:06 +01:00
|
|
|
+
|
2016-02-29 22:32:46 +01:00
|
|
|
entitypigzombie.setSlot(EnumItemSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
|
2014-11-25 22:32:16 +01:00
|
|
|
entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
|
2016-05-10 13:47:39 +02:00
|
|
|
entitypigzombie.setAI(this.hasAI());
|
2016-12-20 21:00:00 +01:00
|
|
|
@@ -164,7 +172,8 @@
|
2015-02-26 23:41:06 +01:00
|
|
|
entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
|
|
|
|
}
|
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
- 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();
|
|
|
|
}
|
|
|
|
}
|