2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/EntityPig.java
|
|
|
|
+++ b/net/minecraft/server/EntityPig.java
|
2017-05-14 04:00:00 +02:00
|
|
|
@@ -4,6 +4,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 {
|
|
|
|
|
2017-05-14 04:00:00 +02:00
|
|
|
private static final DataWatcherObject<Boolean> bx = DataWatcher.a(EntityPig.class, DataWatcherRegistry.h);
|
|
|
|
@@ -124,13 +126,14 @@
|
2017-01-24 03:39:22 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public void die(DamageSource damagesource) {
|
|
|
|
- super.die(damagesource);
|
|
|
|
+ // super.die(damagesource); // CraftBukkit - Moved to end
|
|
|
|
if (!this.world.isClientSide) {
|
|
|
|
if (this.hasSaddle()) {
|
|
|
|
this.a(Items.SADDLE, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
+ super.die(damagesource); // CraftBukkit - Moved from above
|
|
|
|
}
|
|
|
|
|
|
|
|
@Nullable
|
2017-05-14 04:00:00 +02:00
|
|
|
@@ -155,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());
|
2017-05-14 04:00:00 +02:00
|
|
|
@@ -163,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();
|
|
|
|
}
|
|
|
|
}
|