mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-11-04 03:03:43 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			7.5.1
			...
			fix/wrong-
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					2633aa41a0 | 
@@ -114,26 +114,14 @@ public abstract class SquarePlotManager extends GridPlotManager {
 | 
				
			|||||||
            end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
 | 
					            end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        int size = squarePlotWorld.PLOT_WIDTH + squarePlotWorld.ROAD_WIDTH;
 | 
					        int size = squarePlotWorld.PLOT_WIDTH + squarePlotWorld.ROAD_WIDTH;
 | 
				
			||||||
        int idx;
 | 
					        int dx = Math.floorDiv(x, size) + 1;
 | 
				
			||||||
        if (x < 0) {
 | 
					        int rx = Math.floorMod(x, size);
 | 
				
			||||||
            idx = x / size;
 | 
					        int dz = Math.floorDiv(z, size) + 1;
 | 
				
			||||||
            x = size + (x % size);
 | 
					        int rz = Math.floorMod(z, size);
 | 
				
			||||||
        } else {
 | 
					        if (rz <= pathWidthLower || rz > end || rx <= pathWidthLower || rx > end) {
 | 
				
			||||||
            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) {
 | 
					 | 
				
			||||||
            return null;
 | 
					            return null;
 | 
				
			||||||
        } else {
 | 
					        } 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;
 | 
					                end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            int dx;
 | 
					            int dx = Math.floorDiv(x, size) + 1;
 | 
				
			||||||
            int rx;
 | 
					            int rx = Math.floorMod(x, size);
 | 
				
			||||||
            if (x < 0) {
 | 
					            int dz = Math.floorDiv(z, size) + 1;
 | 
				
			||||||
                dx = x / size;
 | 
					            int rz = Math.floorMod(z, 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;
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
            PlotId id = PlotId.of(dx, dz);
 | 
					            PlotId id = PlotId.of(dx, dz);
 | 
				
			||||||
            boolean[] merged = new boolean[]{rz <= pathWidthLower, rx > end, rz > end, rx <= pathWidthLower};
 | 
					            boolean[] merged = new boolean[]{rz <= pathWidthLower, rx > end, rz > end, rx <= pathWidthLower};
 | 
				
			||||||
            int hash = HashUtil.hash(merged);
 | 
					            int hash = HashUtil.hash(merged);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user