1 files changed, 35 insertions, 0 deletions
diff --git a/patches/server/0380-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0380-Improve-fix-EntityTargetLivingEntityEvent.patch
new file mode 100644
index 0000000000..29703174a1
--- /dev/null
+++ b/patches/server/0380-Improve-fix-EntityTargetLivingEntityEvent.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Fri, 9 Dec 2022 03:10:23 -0800
+Subject: [PATCH] Improve/fix EntityTargetLivingEntityEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
+index cc7d161b53a2295fa1745254eafb8a70c7b6c7b2..508d4f391fe563453d7bf6782b3082741c358006 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
++++ b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
+@@ -47,9 +47,22 @@ public class StopAttackingIfTargetInvalid {
+                     if (entityinsentient.canAttack(entityliving) && (!shouldForgetIfTargetUnreachable || !StopAttackingIfTargetInvalid.isTiredOfTryingToReachTarget(entityinsentient, behaviorbuilder_b.tryGet(memoryaccessor1))) && entityliving.isAlive() && entityliving.level() == entityinsentient.level() && !alternativeCondition.test(entityliving)) {
+                         return true;
+                     } else {
++                        // Paper start - better track target change reason
++                        final EntityTargetEvent.TargetReason reason;
++                        if (!entityinsentient.canAttack(entityliving)) {
++                            reason = EntityTargetEvent.TargetReason.TARGET_INVALID;
++                        } else if (shouldForgetIfTargetUnreachable && StopAttackingIfTargetInvalid.isTiredOfTryingToReachTarget(entityinsentient, behaviorbuilder_b.tryGet(memoryaccessor1))) {
++                            reason = EntityTargetEvent.TargetReason.FORGOT_TARGET;
++                        } else if (!entityliving.isAlive()) {
++                            reason = EntityTargetEvent.TargetReason.TARGET_DIED;
++                        } else if (entityliving.level() != entityinsentient.level()) {
++                            reason = EntityTargetEvent.TargetReason.TARGET_OTHER_LEVEL;
++                        } else {
++                            reason = EntityTargetEvent.TargetReason.TARGET_INVALID;
++                        }
++                        // Paper end
+                         // CraftBukkit start
+-                        LivingEntity old = entityinsentient.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null);
+-                        EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entityinsentient, null, (old != null && !old.isAlive()) ? EntityTargetEvent.TargetReason.TARGET_DIED : EntityTargetEvent.TargetReason.FORGOT_TARGET);
++                        EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entityinsentient, null, reason); // Paper
+                         if (event.isCancelled()) {
+                             return false;
+                         }