Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-11-15 23:26:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix some region issues

Browse Source
This commit is contained in:
Jesse Boyd 2018-05-08 15:24:50 +10:00
parent ba5f37cd32
commit 345b344000
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
4 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/resources/plugin.yml
View File

@ -18,6 +18,8 @@ permissions:
fawe.plotsquared.trusted: true
fawe.plotme:
default: true
fawe.bypass.regions:
default: false
fawe.bypass:
default: false
children:

4
core/src/main/java/com/boydti/fawe/util/ExtentTraverser.java
View File

@ -60,7 +60,7 @@ public class ExtentTraverser<T extends Extent> {
}
public <U> U findAndGet(Class<U> clazz) {
ExtentTraverser<Extent> traverser = find(clazz);
ExtentTraverser<Extent> traverser = find((Class) clazz);
return (traverser != null) ? (U) traverser.get() : null;
}
@ -68,7 +68,7 @@ public class ExtentTraverser<T extends Extent> {
try {
ExtentTraverser<T> value = this;
while (value != null) {
if (clazz.isInstance(value.root)) {
if (clazz.isAssignableFrom(value.root.getClass())) {
return (ExtentTraverser<U>) value;
}
value = value.next();

55
core/src/main/java/com/boydti/fawe/util/WEManager.java
View File

@ -15,9 +15,8 @@ import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.regions.Region;
import java.lang.reflect.Field;
import java.util.ArrayDeque;
import java.util.HashSet;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
public class WEManager {
@ -98,33 +97,37 @@ public class WEManager {
}
player.setMeta("lastMaskWorld", world);
Set<FaweMask> masks = player.getMeta("lastMask");
HashSet<Region> regions = new HashSet<>();
Set<Region> backupRegions = new HashSet<>();
Set<Region> regions = new HashSet<>();
if (masks == null) {
masks = new HashSet<>();
} else {
boolean removed = false;
if (masks.isEmpty()) {
removed = true;
} else {
for (FaweMask mask : masks) {
Region region = mask.getRegion();
if (!region.contains(loc.x, loc.y, loc.z)) {
removed = true;
synchronized (masks) {
boolean removed = false;
if (!masks.isEmpty()) {
Iterator<FaweMask> iter = masks.iterator();
while (iter.hasNext()) {
FaweMask mask = iter.next();
if (mask.isValid(player, type)) {
Region region = mask.getRegion();
if (region.contains(loc.x, loc.y, loc.z)) {
regions.add(region);
} else {
removed = true;
backupRegions.add(region);
}
} else {
removed = true;
iter.remove();
}
}
if (!mask.isValid(player, type)) {
removed = true;
break;
}
regions.add(region);
}
}
if (removed) {
masks.clear();
regions.clear();
} else {
return regions.toArray(new Region[regions.size()]);
if (!removed) return regions.toArray(new Region[regions.size()]);
}
}
Set<FaweMask> tmpMasks = new HashSet<>();
for (final FaweMaskManager manager : managers) {
if (player.hasPermission("fawe." + manager.getKey())) {
try {
@ -138,6 +141,12 @@ public class WEManager {
}
}
}
if (!tmpMasks.isEmpty()) {
masks = tmpMasks;
regions = masks.stream().map(mask -> mask.getRegion()).collect(Collectors.toSet());
} else {
regions.addAll(backupRegions);
}
if (!masks.isEmpty()) {
player.setMeta("lastMask", masks);
} else {

2
nukkit/src/main/resources/plugin.yml
View File

@ -10,6 +10,8 @@ permissions:
fawe.plotsquared.trusted: true
fawe.plotme:
default: true
fawe.bypass.regions:
default: false
fawe.bypass:
default: false
children: