EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix worldedit mask area

Browse Source
This commit is contained in:
Jesse Boyd 2016-11-12 00:14:12 +11:00
parent 17762f5ae7
commit f8b1fcffa1
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/main/java/com/plotsquared/listener/WEManager.java
View File

@ -55,14 +55,17 @@ public class WEManager {
plot = player.getMeta("WorldEditRegionPlot"); plot = player.getMeta("WorldEditRegionPlot");
} }
if (plot != null && (!Settings.Done.RESTRICT_BUILDING || !Flags.DONE.isSet(plot)) && ((allowMember && plot.isAdded(uuid)) || (!allowMember && (plot.isOwner(uuid)) || plot.getTrusted().contains(uuid)))) { if (plot != null && (!Settings.Done.RESTRICT_BUILDING || !Flags.DONE.isSet(plot)) && ((allowMember && plot.isAdded(uuid)) || (!allowMember && (plot.isOwner(uuid)) || plot.getTrusted().contains(uuid)))) {
regions.addAll(plot.getRegions()); for (RegionWrapper region : plot.getRegions()) {
RegionWrapper copy = new RegionWrapper(region.minX, region.maxX, area.MIN_BUILD_HEIGHT, area.MAX_BUILD_HEIGHT, region.minZ, region.maxZ);
regions.add(copy);
}
player.setMeta("WorldEditRegionPlot", plot); player.setMeta("WorldEditRegionPlot", plot);
} }
return regions; return regions;
} }
public static boolean intersects(RegionWrapper region1, RegionWrapper region2) { public static boolean intersects(RegionWrapper region1, RegionWrapper region2) {
return (region1.minX <= region2.maxX) && (region1.maxX >= region2.minX) && (region1.minZ <= region2.maxZ) && (region1.maxZ >= region2.minZ); return region1.intersects(region2);
} }
public static boolean regionContains(RegionWrapper selection, HashSet<RegionWrapper> mask) { public static boolean regionContains(RegionWrapper selection, HashSet<RegionWrapper> mask) {