Skip to content

Fix #11919: Some Zombified Piglins don't forgive players after death #12379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix #11919: Some Zombified Piglins don't forgive players after death #12379

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
145b111
Fix #11919: Some Zombified Piglins don't forgive players after death
Guilherme-Corvelo Mar 31, 2025
19fc409
Merge branch 'main' into BUG_PIC
Guilherme-Corvelo Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions paper-server/patches/sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
--- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
@@ -56,6 +_,7 @@
@@ -56,6 +_,8 @@
private static final int ALERT_RANGE_Y = 10;
private static final UniformInt ALERT_INTERVAL = TimeUtil.rangeOfSeconds(4, 6);
private int ticksUntilNextAlert;
+ private HurtByTargetGoal hurtByTargetGoal; // Paper - fix PigZombieAngerEvent cancellation
+ private HurtByTargetGoal pathfinderGoalHurtByTarget; // Paper - fix PigZombieAngerEvent cancellation
+ private ResetUniversalAngerTargetGoal<ZombifiedPiglin> resetUniversalTarget; // Paper - fix ZombifiedPiglin anger persistence after player death

public ZombifiedPiglin(EntityType<? extends ZombifiedPiglin> entityType, Level level) {
super(entityType, level);
@@ -71,7 +_,7 @@
@@ -71,9 +_,9 @@
protected void addBehaviourGoals() {
this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0, false));
this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0));
- this.targetSelector.addGoal(1, new HurtByTargetGoal(this).setAlertOthers());
+ this.targetSelector.addGoal(1, this.hurtByTargetGoal = (new HurtByTargetGoal(this)).setAlertOthers()); // Paper - fix PigZombieAngerEvent cancellation
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
- this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
+ this.targetSelector.addGoal(3,this.resetUniversalTarget = (new ResetUniversalAngerTargetGoal<ZombifiedPiglin>(this, true))); // Paper - fix ZombifiedPiglin anger persistence after player death
}
@@ -144,7 +_,7 @@

public static AttributeSupplier.Builder createAttributes() {
@@ -148,7 +_,7 @@
.filter(zombifiedPiglin -> zombifiedPiglin != this)
.filter(zombifiedPiglin -> zombifiedPiglin.getTarget() == null)
.filter(zombifiedPiglin -> !zombifiedPiglin.isAlliedTo(this.getTarget()))
Expand Down Expand Up @@ -45,11 +49,12 @@
public void startPersistentAngerTimer() {
- this.setRemainingPersistentAngerTime(PERSISTENT_ANGER_TIME.sample(this.random));
+ // CraftBukkit start
+ net.minecraft.world.entity.Entity entity = this.level().getEntity(this.getPersistentAngerTarget());
+ org.bukkit.event.entity.PigZombieAngerEvent event = new org.bukkit.event.entity.PigZombieAngerEvent((org.bukkit.entity.PigZombie) this.getBukkitEntity(), (entity == null) ? null : entity.getBukkitEntity(), PERSISTENT_ANGER_TIME.sample(this.random));
+ if (!event.callEvent()) {
+ this.setPersistentAngerTarget(null);
+ this.hurtByTargetGoal.stop();
+ net.minecraft.world.entity.Entity entity = ((ServerLevel) this.level()).getEntity(this.getPersistentAngerTarget());
+ org.bukkit.event.entity.PigZombieAngerEvent event = new org.bukkit.event.entity.PigZombieAngerEvent((org.bukkit.entity.PigZombie) this.getBukkitEntity(), (entity == null) ? null : entity.getBukkitEntity(), ZombifiedPiglin.PERSISTENT_ANGER_TIME.sample(this.random));
+ this.level().getCraftServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ this.pathfinderGoalHurtByTarget.stop(); // Paper - fix PigZombieAngerEvent cancellation
+ this.resetUniversalTarget.start(); // Paper - fix ZombifiedPiglin anger persistence after player death
+ return;
+ }
+ this.setRemainingPersistentAngerTime(event.getNewAnger());
Expand Down
Loading