Paper/patches/server/0455-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch

60 lines
3.7 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 3 Jul 2020 15:03:33 -0700
Subject: [PATCH] Improve EntityTargetLivingEntityEvent for 1.16 mobs
CraftBukkit has a bug in their implementation and is incorrectly handling forget
Also adds more target reasons for why it forgot target.
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
2022-06-08 07:46:52 +02:00
index 44d3c9da39389b72bfc5ee39c1abb6baf9dccdb1..565691aaed71de3efe15dd751fbbbe7849ef56b7 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
2022-06-08 07:46:52 +02:00
@@ -56,15 +56,15 @@ public class StopAttackingIfTargetInvalid<E extends Mob> extends Behavior<E> {
2021-06-14 11:46:59 +02:00
LivingEntity entityliving = this.getAttackTarget(entity);
2021-06-11 14:02:28 +02:00
2021-06-14 11:46:59 +02:00
if (!entity.canAttack(entityliving)) {
2021-06-11 14:02:28 +02:00
- this.clearAttackTarget(entity);
2021-06-14 11:46:59 +02:00
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_INVALID); // Paper
2022-06-08 07:46:52 +02:00
} else if (this.canGrowTiredOfTryingToReachTarget && StopAttackingIfTargetInvalid.isTiredOfTryingToReachTarget(entity)) {
2021-06-14 11:46:59 +02:00
- this.clearAttackTarget(entity);
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FORGOT_TARGET); // Paper
2021-06-11 14:02:28 +02:00
} else if (this.isCurrentTargetDeadOrRemoved(entity)) {
- this.clearAttackTarget(entity);
2021-06-14 11:46:59 +02:00
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_DIED); // Paper
2021-06-11 14:02:28 +02:00
} else if (this.isCurrentTargetInDifferentLevel(entity)) {
- this.clearAttackTarget(entity);
2021-06-14 11:46:59 +02:00
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_OTHER_LEVEL); // Paper
2021-06-11 14:02:28 +02:00
} else if (this.stopAttackingWhen.test(this.getAttackTarget(entity))) {
- this.clearAttackTarget(entity);
2021-06-14 11:46:59 +02:00
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_INVALID); // Paper
2021-06-11 14:02:28 +02:00
}
}
2022-06-08 07:46:52 +02:00
@@ -88,17 +88,20 @@ public class StopAttackingIfTargetInvalid<E extends Mob> extends Behavior<E> {
2021-06-11 14:02:28 +02:00
return optional.isPresent() && !((LivingEntity) optional.get()).isAlive();
}
2021-06-14 11:46:59 +02:00
- protected void clearAttackTarget(E entity) {
+ protected void clearAttackTarget(E entity, EntityTargetEvent.TargetReason reason) {
2021-06-11 14:02:28 +02:00
// CraftBukkit start
- LivingEntity old = entity.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null);
- EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entity, null, (old != null && !old.isAlive()) ? EntityTargetEvent.TargetReason.TARGET_DIED : EntityTargetEvent.TargetReason.FORGOT_TARGET);
+ // Paper start - fix this event
2022-06-08 07:46:52 +02:00
+ // LivingEntity old = entity.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null);
+ EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entity, null, reason);
2021-06-11 14:02:28 +02:00
if (event.isCancelled()) {
return;
}
- if (event.getTarget() != null) {
+ // comment out, bad logic - bad
+ /*if (event.getTarget() != null) {
2022-06-08 07:46:52 +02:00
entity.getBrain().setMemory(MemoryModuleType.ATTACK_TARGET, ((CraftLivingEntity) event.getTarget()).getHandle());
2021-06-11 14:02:28 +02:00
return;
- }
+ }*/
+ // Paper end
// CraftBukkit end
2022-06-08 07:46:52 +02:00
this.onTargetErased.accept(entity, this.getAttackTarget(entity));
entity.getBrain().eraseMemory(MemoryModuleType.ATTACK_TARGET);