--- a/net/minecraft/server/EntityPigZombie.java +++ b/net/minecraft/server/EntityPigZombie.java @@ -35,7 +35,7 @@ protected void m() { this.goalSelector.a(2, new PathfinderGoalZombieAttack(this, 1.0D, false)); this.goalSelector.a(7, new PathfinderGoalRandomStrollLand(this, 1.0D)); - this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a()); + this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this).a(new Class[0])); // CraftBukkit - decompile error this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, 10, true, false, this::a_)); this.targetSelector.a(3, new PathfinderGoalUniversalAngerReset<>(this, true)); } @@ -108,7 +108,7 @@ }).filter((entitypigzombie) -> { return !entitypigzombie.r(this.getGoalTarget()); }).forEach((entitypigzombie) -> { - entitypigzombie.setGoalTarget(this.getGoalTarget()); + entitypigzombie.setGoalTarget(this.getGoalTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY, true); // CraftBukkit }); } @@ -117,7 +117,7 @@ } @Override - public void setGoalTarget(@Nullable EntityLiving entityliving) { + public boolean setGoalTarget(@Nullable EntityLiving entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fireEvent) { // CraftBukkit - signature if (this.getGoalTarget() == null && entityliving != null) { this.bo = EntityPigZombie.d.a(this.random); this.bt = EntityPigZombie.bs.a(this.random); @@ -127,12 +127,21 @@ this.e((EntityHuman) entityliving); } - super.setGoalTarget(entityliving); + return super.setGoalTarget(entityliving, reason, fireEvent); // CraftBukkit } @Override public void anger() { - this.setAnger(EntityPigZombie.bp.a(this.random)); + // CraftBukkit start + Entity entity = ((WorldServer) this.world).getEntity(getAngerTarget()); + org.bukkit.event.entity.PigZombieAngerEvent event = new org.bukkit.event.entity.PigZombieAngerEvent((org.bukkit.entity.PigZombie) this.getBukkitEntity(), (entity == null) ? null : entity.getBukkitEntity(), EntityPigZombie.bp.a(this.random)); + this.world.getServer().getPluginManager().callEvent(event); + if (event.isCancelled()) { + this.setAngerTarget(null); + return; + } + this.setAnger(event.getNewAnger()); + // CraftBukkit end } public static boolean b(EntityTypes entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) {