summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityPigZombie.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-08-05 10:18:01 +1000
committermd_5 <git@md-5.net>2018-08-05 10:18:01 +1000
commit195f071e3da0229688323a7c39309254ddb0d828 (patch)
tree6f4074923e8cf99067612eb70dfb0cfc1e746374 /nms-patches/EntityPigZombie.patch
parent5e3082c7d8b6b7b6ef5e7774349e3cb3da0d996c (diff)
downloadcraftbukkit-195f071e3da0229688323a7c39309254ddb0d828.tar
craftbukkit-195f071e3da0229688323a7c39309254ddb0d828.tar.gz
craftbukkit-195f071e3da0229688323a7c39309254ddb0d828.tar.lz
craftbukkit-195f071e3da0229688323a7c39309254ddb0d828.tar.xz
craftbukkit-195f071e3da0229688323a7c39309254ddb0d828.zip
SPIGOT-4219: Event for PigZombies angering.
Diffstat (limited to 'nms-patches/EntityPigZombie.patch')
-rw-r--r--nms-patches/EntityPigZombie.patch15
1 files changed, 14 insertions, 1 deletions
diff --git a/nms-patches/EntityPigZombie.patch b/nms-patches/EntityPigZombie.patch
index 96303f5c..0ebbc601 100644
--- a/nms-patches/EntityPigZombie.patch
+++ b/nms-patches/EntityPigZombie.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityPigZombie.java
+++ b/net/minecraft/server/EntityPigZombie.java
-@@ -113,11 +113,15 @@
+@@ -113,16 +113,27 @@
} else {
Entity entity = damagesource.getEntity();
@@ -18,3 +18,16 @@
}
}
+ private void a(Entity entity) {
+- this.angerLevel = 400 + this.random.nextInt(400);
++ // CraftBukkit start
++ org.bukkit.event.entity.PigZombieAngerEvent event = new org.bukkit.event.entity.PigZombieAngerEvent((org.bukkit.entity.PigZombie) this.getBukkitEntity(), (entity == null) ? null : entity.getBukkitEntity(), 400 + this.random.nextInt(400));
++ this.world.getServer().getPluginManager().callEvent(event);
++ if (event.isCancelled()) {
++ return;
++ }
++ this.angerLevel = event.getNewAnger();
++ // CraftBukkit end
+ this.soundDelay = this.random.nextInt(40);
+ if (entity instanceof EntityLiving) {
+ this.a((EntityLiving) entity);