mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make EntityLookup#get use read lock for entity maps

Browse source 
On Folia, this map is modified by multiple threads and iterating
it may throw errors, for example using the /kill command or any
other command that uses an entity selector.
This commit is contained in:
Spottedleaf 2023-10-09 10:02:37 -07:00
parent a702a083cd
commit 99b735c1ac
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
patches/server/0018-Rewrite-chunk-system.patch
View file

@ -3575,10 +3575,10 @@ index 0000000000000000000000000000000000000000..1b090f1e79b996e52097afc49c1cec85
+}
diff --git a/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
new file mode 100644
index 0000000000000000000000000000000000000000..c4d1dbbd39ba0cdc9176ffa6d350d2aa50380211
index 0000000000000000000000000000000000000000..15ee41452992714108efe53b708b5a4e1da7c1ff
--- /dev/null
+++ b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
@@ -0,0 +1,894 @@
@@ -0,0 +1,902 @@
+package io.papermc.paper.chunk.system.entity;
+
+import com.destroystokyo.paper.util.maplist.EntityList;
@ -3781,7 +3781,15 @@ index 0000000000000000000000000000000000000000..c4d1dbbd39ba0cdc9176ffa6d350d2aa
+
+ @Override
+ public <U extends Entity> void get(final EntityTypeTest<Entity, U> filter, final AbortableIterationConsumer<U> action) {
+ for (final Entity entity : this.entityById.values()) {
+ final Int2ReferenceOpenHashMap<Entity> entityCopy;
+
+ this.entityByLock.readLock();
+ try {
+ entityCopy = this.entityById.clone();
+ } finally {
+ this.entityByLock.tryUnlockRead();
+ }
+ for (final Entity entity : entityCopy.values()) {
+ final Visibility visibility = EntityLookup.getEntityStatus(entity);
+ if (!visibility.isAccessible()) {
+ continue;