EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-28 11:44:42 +02:00
Code Issues Projects Releases Wiki Activity

WE delayed command execution + fix SBQ notify

Browse Source
This commit is contained in:
boy0001
2015-08-26 12:02:00 +10:00
parent dc37465c8a
commit 1872e147cb
3 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -142,6 +142,8 @@ public enum C {
/*
* WorldEdit masks
*/
WORLDEDIT_DELAYED("$2Please wait while we process your WorldEdit action...", "WorldEdit Masks"),
WORLDEDIT_RUN("$2Apologies for the delay. Now executing: %s", "WorldEdit Masks"),
REQUIRE_SELECTION_IN_MASK("$2%s of your selection is not within your plot mask. You can only make edits within your plot.", "WorldEdit Masks"),
WORLDEDIT_VOLUME("$2You cannot select a volume of %current%. The maximum volume you can modify is %max%.", "WorldEdit Masks"),
WORLDEDIT_ITERATIONS("$2You cannot iterate %current% times. The maximum number of iterations allowed is %max%.", "WorldEdit Masks"),

36
src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java
View File

@ -1,7 +1,7 @@
package com.intellectualcrafters.plot.util;
import java.util.ArrayDeque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map.Entry;
import com.intellectualcrafters.plot.PS;
@ -14,7 +14,7 @@ public class SetBlockQueue {
private volatile static int allocate = 25;
private volatile static boolean running = false;
private volatile static boolean locked = false;
private volatile static HashSet<Runnable> runnables;
private volatile static ArrayDeque<Runnable> runnables;
private volatile static boolean slow = false;
private static long last;
private static int lastInt = 0;
@ -32,15 +32,22 @@ public class SetBlockQueue {
slow = value;
}
public synchronized static void addNotify(Runnable whenDone) {
public synchronized static boolean addNotify(Runnable whenDone) {
if (runnables == null) {
TaskManager.runTask(whenDone);
slow = false;
locked = false;
if (blocks == null) {
if (whenDone != null) {
whenDone.run();
}
slow = false;
locked = false;
return true;
}
runnables = new ArrayDeque<>();
}
else {
if (whenDone != null) {
runnables.add(whenDone);
}
return false;
}
public synchronized static void init() {
@ -49,7 +56,7 @@ public class SetBlockQueue {
MainUtil.initCache();
}
blocks = new HashMap<>();
runnables = new HashSet<>();
runnables = new ArrayDeque<>();
}
if (!running) {
TaskManager.index.incrementAndGet();
@ -62,17 +69,18 @@ public class SetBlockQueue {
}
if (blocks == null || blocks.size() == 0) {
PS.get().TASK.cancelTask(TaskManager.tasks.get(current));
if (runnables != null) {
for (Runnable runnable : runnables) {
TaskManager.runTask(runnable);
}
}
ArrayDeque<Runnable> tasks = runnables;
lastInt = -1;
lastBlock = null;
runnables = null;
blocks = new HashMap<>();
blocks = null;
running = false;
slow = false;
if (tasks != null) {
for (Runnable runnable : tasks) {
runnable.run();
}
}
return;
}
long newLast = System.currentTimeMillis();