File tree Expand file tree Collapse file tree 1 file changed +19
-0
lines changed
paper-server/patches/sources/net/minecraft/world/entity Expand file tree Collapse file tree 1 file changed +19
-0
lines changed Original file line number Diff line number Diff line change 1313 }
1414 }
1515
16+ @@ -61,11 +_,16 @@
17+ this.stopBeingAngry();
18+ } else {
19+ if (target != null) {
20+ - if (persistentAngerTarget == null || !persistentAngerTarget.matches(target)) {
21+ + // Paper start - Backport fix for MC-305388 from 26.1-snapshot-5
22+ + boolean newTarget = persistentAngerTarget == null || !persistentAngerTarget.matches(target);
23+ + if (newTarget) {
24+ this.setPersistentAngerTarget(EntityReference.of(target));
25+ }
26+
27+ - this.startPersistentAngerTimer();
28+ + if (newTarget || updateAnger) {
29+ + this.startPersistentAngerTimer();
30+ + }
31+ + // Paper end - Backport fix for MC-305388 from 26.1-snapshot-5
32+ }
33+
34+ if (persistentAngerTarget != null && !this.isAngry() && (target == null || !isValidPlayerTarget(target) || !updateAnger)) {
1635@@ -120,7 +_,7 @@
1736 default void stopBeingAngry() {
1837 this.setLastHurtByMob(null);
You can’t perform that action at this time.
0 commit comments