Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 12:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong plot id calculation for negative coordinates (#3898)

Browse Source
This commit is contained in:
Hannes Greule 2023-01-04 12:35:12 +01:00 committed by GitHub
parent 742d78a505
commit 339ca8e30f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
View File

@ -114,26 +114,14 @@ public abstract class SquarePlotManager extends GridPlotManager {
end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
}
int size = squarePlotWorld.PLOT_WIDTH + squarePlotWorld.ROAD_WIDTH;
int idx;
if (x < 0) {
idx = x / size;
x = size + (x % size);
} else {
idx = (x / size) + 1;
x = x % size;
}
int idz;
if (z < 0) {
idz = z / size;
z = size + (z % size);
} else {
idz = (z / size) + 1;
z = z % size;
}
if (z <= pathWidthLower || z > end || x <= pathWidthLower || x > end) {
int dx = Math.floorDiv(x, size) + 1;
int rx = Math.floorMod(x, size);
int dz = Math.floorDiv(z, size) + 1;
int rz = Math.floorMod(z, size);
if (rz <= pathWidthLower || rz > end || rx <= pathWidthLower || rx > end) {
return null;
} else {
return PlotId.of(idx, idz);
return PlotId.of(dx, dz);
}
}
@ -180,24 +168,10 @@ public abstract class SquarePlotManager extends GridPlotManager {
}
end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
}
int dx;
int rx;
if (x < 0) {
dx = x / size;
rx = size + (x % size);
} else {
dx = (x / size) + 1;
rx = x % size;
}
int dz;
int rz;
if (z < 0) {
dz = z / size;
rz = size + (z % size);
} else {
dz = (z / size) + 1;
rz = z % size;
}
int dx = Math.floorDiv(x, size) + 1;
int rx = Math.floorMod(x, size);
int dz = Math.floorDiv(z, size) + 1;
int rz = Math.floorMod(z, size);
PlotId id = PlotId.of(dx, dz);
boolean[] merged = new boolean[]{rz <= pathWidthLower, rx > end, rz > end, rx <= pathWidthLower};
int hash = HashUtil.hash(merged);