Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-23 00:39:20 +00:00
Code Issues Releases Activity

Fix lenient merging sometimes merging entities out of order

Browse Source
This commit is contained in:
Samsuik
2025-05-29 20:57:12 +01:00
parent 476ea68d41
commit 1d4877f84e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sakura-server/src/main/java/me/samsuik/sakura/entity/merge/MergeStrategy.java
View File

@@ -86,12 +86,16 @@ public interface MergeStrategy {
return previous; return previous;
} }
if (!mergeHistory.hasPreviousMerged(entity, previous)) {
this.entityTable.clear();
}
Entity nextEntity = this.entityTable.getAndWrite(entity); Entity nextEntity = this.entityTable.getAndWrite(entity);
if (nextEntity == null || entity == nextEntity || !nextEntity.level().equals(entity.level())) { if (nextEntity == null || entity == nextEntity || !nextEntity.level().equals(entity.level())) {
return null; return null;
} }
return mergeHistory.hasPreviousMerged(entity, nextEntity) && entity.compareState(nextEntity) ? nextEntity : null; return entity.compareState(nextEntity) ? nextEntity : null;
} }
} }