PaperMC/nms-patches/EntityPigZombie.patch

34 lines
1.4 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/EntityPigZombie.java
+++ b/net/minecraft/server/EntityPigZombie.java
2019-04-23 04:00:00 +02:00
@@ -123,16 +123,27 @@
} else {
Entity entity = damagesource.getEntity();
2019-04-23 04:00:00 +02:00
- if (entity instanceof EntityHuman && !((EntityHuman) entity).isCreative()) {
+ // CraftBukkit start
+ boolean result = super.damageEntity(damagesource, f);
+
2019-04-23 04:00:00 +02:00
+ if (result && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative()) {
this.a(entity);
}
- return super.damageEntity(damagesource, f);
+ return result;
+ // CraftBukkit end
}
}
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) {
2018-10-22 21:00:00 +02:00
this.setLastDamager((EntityLiving) entity);