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

Fixes #1285

Browse Source
This commit is contained in:
Jesse Boyd 2016-08-26 13:19:42 +10:00
parent 61d00e51ef
commit a95d18499e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -15,6 +15,7 @@ import com.intellectualcrafters.plot.util.BO3Handler;
import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.EventUtil; import com.intellectualcrafters.plot.util.EventUtil;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.SchematicHandler; import com.intellectualcrafters.plot.util.SchematicHandler;
import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.StringMan;
@ -25,10 +26,9 @@ import com.intellectualcrafters.plot.util.block.GlobalBlockQueue;
import com.intellectualcrafters.plot.util.block.LocalBlockQueue; import com.intellectualcrafters.plot.util.block.LocalBlockQueue;
import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; import com.intellectualcrafters.plot.util.expiry.PlotAnalysis;
import com.plotsquared.listener.PlotListener; import com.plotsquared.listener.PlotListener;
import java.awt.Rectangle;
import java.awt.geom.Area; import java.awt.geom.Area;
import java.awt.geom.PathIterator; import java.awt.geom.PathIterator;
import java.awt.geom.Rectangle2D;
import java.io.File; import java.io.File;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -2529,15 +2529,16 @@ public class Plot {
public List<Location> getAllCorners() { public List<Location> getAllCorners() {
Area area = new Area(); Area area = new Area();
for (RegionWrapper region : this.getRegions()) { for (RegionWrapper region : this.getRegions()) {
Area rectArea = new Area(new Rectangle(region.minX, region.minZ, region.maxX - region.minX + 1, region.maxZ - region.minZ + 1)); Rectangle2D rect = new Rectangle2D.Double(region.minX - 0.6, region.minZ - 0.6, region.maxX - region.minX + 1.2, region.maxZ - region.minZ + 1.2);
Area rectArea = new Area(rect);
area.add(rectArea); area.add(rectArea);
} }
List<Location> locs = new ArrayList<>(); List<Location> locs = new ArrayList<>();
double[] coords = new double[6]; double[] coords = new double[6];
for (PathIterator pi = area.getPathIterator(null); !pi.isDone(); pi.next()) { for (PathIterator pi = area.getPathIterator(null); !pi.isDone(); pi.next()) {
int type = pi.currentSegment(coords); int type = pi.currentSegment(coords);
int x = (int) coords[0]; int x = (int) MathMan.inverseRound(coords[0]);
int z = (int) coords[1]; int z = (int) MathMan.inverseRound(coords[1]);
if (type != 4) { if (type != 4) {
locs.add(new Location(this.area.worldname, x, 0, z)); locs.add(new Location(this.area.worldname, x, 0, z));
} }

5
Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java
View File

@ -66,6 +66,11 @@ public class MathMan {
return (byte) ((value >> 4) & 0xF); return (byte) ((value >> 4) & 0xF);
} }
public static long inverseRound(double val) {
long round = Math.round(val);
return (long) (round + Math.signum(val - round));
}
public static int sqrt(int x) { public static int sqrt(int x) {
int xn; int xn;