Skip to content

Fix Bee anger never gets timeout #13546

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

Merged
lynxplay merged 6 commits into from
Jan 29, 2026
Merged

Fix Bee anger never gets timeout #13546

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
295ad93
Fix Bee anger never gets timeout
HaHaWTH Jan 11, 2026
345648c
minimize diffs
HaHaWTH Jan 16, 2026
63d9bf4
Add configuration
HaHaWTH Jan 16, 2026
ac66670
Merge remote-tracking branch 'origin/main' into fix/mc-305388
lynxplay Jan 27, 2026
dbd4092
Backport from 26.1-snapshot-5
lynxplay Jan 27, 2026
c016917
Drop configuration option
lynxplay Jan 27, 2026
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
19 changes: 19 additions & 0 deletions paper-server/patches/sources/net/minecraft/world/entity/NeutralMob.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,25 @@
}
}

@@ -61,11 +_,16 @@
this.stopBeingAngry();
} else {
if (target != null) {
- if (persistentAngerTarget == null || !persistentAngerTarget.matches(target)) {
+ // Paper start - Backport fix for MC-305388 from 26.1-snapshot-5
+ boolean newTarget = persistentAngerTarget == null || !persistentAngerTarget.matches(target);
+ if (newTarget) {
this.setPersistentAngerTarget(EntityReference.of(target));
}

- this.startPersistentAngerTimer();
+ if (newTarget || updateAnger) {
+ this.startPersistentAngerTimer();
+ }
+ // Paper end - Backport fix for MC-305388 from 26.1-snapshot-5
}

if (persistentAngerTarget != null && !this.isAngry() && (target == null || !isValidPlayerTarget(target) || !updateAnger)) {
@@ -120,7 +_,7 @@
default void stopBeingAngry() {
this.setLastHurtByMob(null);
Expand Down
Loading