PaperMC/nms-patches/EntityPigZombie.patch

43 lines
2 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/EntityPigZombie.java
+++ b/net/minecraft/server/EntityPigZombie.java
2019-06-21 12:00:00 +02:00
@@ -134,16 +134,27 @@
} else {
Entity entity = damagesource.getEntity();
2019-06-21 12:00:00 +02:00
- if (entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity)) {
+ // CraftBukkit start
+ boolean result = super.damageEntity(damagesource, f);
+
2019-06-21 12:00:00 +02:00
+ if (result && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity)) {
this.a(entity);
}
- return super.damageEntity(damagesource, f);
+ return result;
+ // CraftBukkit end
}
}
2019-06-21 12:00:00 +02:00
private boolean a(Entity entity) {
2019-07-20 01:00:00 +02:00
- this.angerLevel = this.ee();
+ // CraftBukkit start
2019-07-20 01:00:00 +02:00
+ org.bukkit.event.entity.PigZombieAngerEvent event = new org.bukkit.event.entity.PigZombieAngerEvent((org.bukkit.entity.PigZombie) this.getBukkitEntity(), (entity == null) ? null : entity.getBukkitEntity(), this.ee());
+ this.world.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
2019-06-21 12:00:00 +02:00
+ return false;
+ }
+ 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);
@@ -217,7 +228,7 @@
@Override
protected void a(EntityInsentient entityinsentient, EntityLiving entityliving) {
if (entityinsentient instanceof EntityPigZombie && this.e.hasLineOfSight(entityliving) && ((EntityPigZombie) entityinsentient).a((Entity) entityliving)) {
- entityinsentient.setGoalTarget(entityliving);
+ entityinsentient.setGoalTarget(entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY, true); // CraftBukkit
}
}