PaperMC/nms-patches/EntityPig.patch

29 lines
1.1 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityPig.java
+++ b/net/minecraft/server/EntityPig.java
2020-06-25 02:00:00 +02:00
@@ -3,6 +3,10 @@
import com.google.common.collect.UnmodifiableIterator;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+// CraftBukkit end
+
2020-06-25 02:00:00 +02:00
public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
2020-08-11 23:00:00 +02:00
private static final DataWatcherObject<Boolean> bo = DataWatcher.a(EntityPig.class, DataWatcherRegistry.i);
2020-06-25 02:00:00 +02:00
@@ -204,7 +208,13 @@
}
2019-04-23 04:00:00 +02:00
2020-06-25 02:00:00 +02:00
entitypigzombie.setPersistent();
2020-08-11 23:00:00 +02:00
- worldserver.addEntity(entitypigzombie);
2020-06-25 02:00:00 +02:00
+ // CraftBukkit start
+ if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
+ return;
+ }
+ // CraftBukkit - added a reason for spawning this creature
2020-08-11 23:00:00 +02:00
+ worldserver.addEntity(entitypigzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);
2020-06-25 02:00:00 +02:00
+ // CraftBukkit end
this.die();
} else {
2020-08-11 23:00:00 +02:00
super.onLightningStrike(worldserver, entitylightning);