1.4.7f - fixed findNearestRegionId incorrect id calculation were shifted by 1.

Author: MrMarL

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>Oneblock</groupId>
   <artifactId>Oneblock</artifactId>
-  <version>1.4.7</version>
+  <version>1.4.7f</version>
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
     <defaultGoal>clean package</defaultGoal>

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>Oneblock</groupId>
 	<artifactId>Oneblock</artifactId>
-	<version>1.4.7</version>
+	<version>1.4.7f</version>
 	<properties>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/Oneblock/IslandCoordinateCalculator.java

@@ -17,7 +17,18 @@ public static int findNearestRegionId(Location loc) {
 	    int X = 0, Z = 0;
 
 	    for (int i = 0; i < size; i++) {
-	    	if (Oneblock.CircleMode) {
+	        int dx = (X * Oneblock.offset + Oneblock.x) - locX;
+	        int dz = (Z * Oneblock.offset + Oneblock.z) - locZ;
+	        int distSq = dx * dx + dz * dz;
+	        
+	        if (distSq < minDistSq) {
+	            minDistSq = distSq;
+	            nearestId = i;
+	            
+	            if (minDistSq <= halfStoSquared) break;
+	        }
+	        
+	        if (Oneblock.CircleMode) {
 		    	if (X > Z)
 		    		if (X > -Z)
 		    			Z--;
@@ -28,20 +39,7 @@ else if (-X > Z || X == Z && Z < 0)
 		    	else
 		    		X++;
 	    	} 
-	    	else X = i; 
-	    	
-	        int dx = (X * Oneblock.offset + Oneblock.x) - locX;
-	        int dz = (Z * Oneblock.offset + Oneblock.z) - locZ;
-	        int distSq = dx * dx + dz * dz;
-	        
-	        if (distSq < minDistSq) {
-	            minDistSq = distSq;
-	            nearestId = i;
-	            
-	            if (minDistSq <= halfStoSquared) {
-	                break;
-	            }
-	        }
+	    	else X = i + 1; 
 	    }
 	    return nearestId;
 	}

src/plugin.yml

@@ -1,6 +1,6 @@
 name:  Oneblock
 main:  Oneblock.Oneblock
-version:  1.4.7
+version:  1.4.7f
 api-version: 1.13
 author:  MrMarL
 loadbefore: ['Multiverse-Core']