Skip to content

Catch attribute modification off the main thread. #13639

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

Open
mbax wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Open

Catch attribute modification off the main thread. #13639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,10 +521,10 @@ index 34ef15867759ebc7296256a6d5ec286eb3a5f895..d3d97b0b6ff6312f1deb0bb8b1beef8b
movement = this.maybeBackOffFromEdge(movement, type);
Vec3 vec3 = this.collide(movement);
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index 5b6020de0848458f5576113e690b5a6435f35d05..6f49b5e5888a6296b929e465a5ef87dc49bd4516 100644
index c13c51bcdf8e9db62ac818f78c2fa77c5f36a253..3211231fd71820f832b408eb9065a75bb2199154 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -3330,6 +3330,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3331,6 +3331,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
protected void playAttackSound() {
}

Expand Down
8 changes: 8 additions & 0 deletions paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,14 @@
if (mobEffectInstance != null) {
this.onEffectsRemoved(List.of(mobEffectInstance));
return true;
@@ -1101,6 +_,7 @@
}

private void refreshDirtyAttributes() {
+ org.spigotmc.AsyncCatcher.catchOp("attribute update"); // Paper
Set<AttributeInstance> attributesToUpdate = this.getAttributes().getAttributesToUpdate();

for (AttributeInstance attributeInstance : attributesToUpdate) {
@@ -1134,17 +_,62 @@
}

Expand Down
Loading