Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-01 06:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronise access to the PriorityQueue used for effect queuing in AbstractWorld

Browse Source 
- Makes it thread-safe
This commit is contained in:
dordsor21 2022-01-15 17:09:49 +00:00
parent 0ccae19ded
commit d3696f91d4
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
worldedit-core/src/main/java/com/sk89q/worldedit/world/AbstractWorld.java
View File

@ -111,14 +111,18 @@ public abstract class AbstractWorld implements World {
public boolean queueBlockBreakEffect(Platform server, BlockVector3 position, BlockType blockType, double priority) { public boolean queueBlockBreakEffect(Platform server, BlockVector3 position, BlockType blockType, double priority) {
if (taskId == -1) { if (taskId == -1) {
taskId = server.schedule(0, 1, () -> { taskId = server.schedule(0, 1, () -> {
int max = Math.max(1, Math.min(30, effectQueue.size() / 3)); //FAWE start - access to PriorityQueue is not thread-safe
for (int i = 0; i < max; ++i) { synchronized (effectQueue) {
if (effectQueue.isEmpty()) { int max = Math.max(1, Math.min(30, effectQueue.size() / 3));
return; for (int i = 0; i < max; ++i) {
} if (effectQueue.isEmpty()) {
return;
}
effectQueue.poll().play(); effectQueue.poll().play();
}
} }
//FAWE end
}); });
} }
@ -126,7 +130,11 @@ public abstract class AbstractWorld implements World {
return false; return false;
} }
effectQueue.offer(new QueuedEffect(position.toVector3(), blockType, priority)); //FAWE start - access to PriorityQueue is not thread-safe
synchronized (effectQueue) {
effectQueue.offer(new QueuedEffect(position.toVector3(), blockType, priority));
}
//FAWE end
return true; return true;
} }