Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-15 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

freebuild region restrictions

Browse Source
This commit is contained in:
Jesse Boyd
2018-09-05 05:10:15 +10:00
parent 5f8e2ed4d8 8bfbc55c71
commit 82ede1d42b
19 changed files with 230 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/boydti/fawe/util/MainUtil.java
View File

@ -586,7 +586,7 @@ public class MainUtil {
long ratio = total / compressedSize;
long saved = total - compressedSize;
if (ratio > 3 && Thread.currentThread() != Fawe.get().getMainThread() && actor != null) {
if (ratio > 3 && !Fawe.isMainThread() && actor != null) {
BBC.COMPRESSED.send(actor, saved, ratio);
}
} catch (Exception e) {

6
worldedit-core/src/main/java/com/boydti/fawe/util/TaskManager.java
View File

@ -188,7 +188,7 @@ public abstract class TaskManager {
if (r == null) {
return;
}
if (Thread.currentThread() == Fawe.get().getMainThread()) {
if (Fawe.isMainThread()) {
r.run();
} else {
task(r);
@ -336,7 +336,7 @@ public abstract class TaskManager {
* @return
*/
public <T> T syncWhenFree(final RunnableVal<T> function, int timeout) {
if (Fawe.get().getMainThread() == Thread.currentThread()) {
if (Fawe.isMainThread()) {
function.run();
return function.value;
}
@ -389,7 +389,7 @@ public abstract class TaskManager {
}
public <T> T sync(final Supplier<T> function, int timeout) {
if (Fawe.get().getMainThread() == Thread.currentThread()) {
if (Fawe.isMainThread()) {
return function.get();
}
final AtomicBoolean running = new AtomicBoolean(true);

3
worldedit-core/src/main/java/com/boydti/fawe/util/WEManager.java
View File

@ -125,16 +125,19 @@ public class WEManager {
}
}
if (!removed) return regions.toArray(new Region[regions.size()]);
masks.clear();
}
}
Set<FaweMask> tmpMasks = new HashSet<>();
for (final FaweMaskManager manager : managers) {
if (player.hasPermission("fawe." + manager.getKey())) {
try {
if (manager.isExclusive() && !masks.isEmpty()) continue;
final FaweMask mask = manager.getMask(player, FaweMaskManager.MaskType.getDefaultMaskType());
if (mask != null) {
regions.add(mask.getRegion());
masks.add(mask);
if (manager.isExclusive()) break;
}
} catch (Throwable e) {
e.printStackTrace();