1 files changed, 35 insertions, 0 deletions
diff --git a/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch
new file mode 100644
index 0000000000..b0a3c9d25d
--- /dev/null
+++ b/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Trigary <[email protected]>
+Date: Thu, 18 Mar 2021 21:38:01 +0100
+Subject: [PATCH] fix PigZombieAngerEvent cancellation
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+index aa81dba877e6611b23ec514ee1bcf9ac29c94515..c1e0cf7d86d7b45cc4ca342d80f0dc3fe43b0bfd 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
++++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+@@ -52,6 +52,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+     private static final int ALERT_RANGE_Y = 10;
+     private static final UniformInt ALERT_INTERVAL = TimeUtil.rangeOfSeconds(4, 6);
+     private int ticksUntilNextAlert;
++    private HurtByTargetGoal pathfinderGoalHurtByTarget; // Paper
+ 
+     public ZombifiedPiglin(EntityType<? extends ZombifiedPiglin> type, Level world) {
+         super(type, world);
+@@ -72,7 +73,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+     protected void addBehaviourGoals() {
+         this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0D, false));
+         this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
+-        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
++        this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = (new HurtByTargetGoal(this, new Class[0])).setAlertOthers()); // Paper - assign field
+         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
+         this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
+     }
+@@ -175,6 +176,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+         this.level.getCraftServer().getPluginManager().callEvent(event);
+         if (event.isCancelled()) {
+             this.setPersistentAngerTarget(null);
++            pathfinderGoalHurtByTarget.stop(); // Paper - clear goalTargets to fix cancellation
+             return;
+         }
+         this.setRemainingPersistentAngerTime(event.getNewAnger());