Update 1.2.1 (#16)

Fix PlotManager#getMergedPlot
KCodeYT · Aug 14, 2022 · 66cb85c · 66cb85c
1 parent 07d6a82
commit 66cb85c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ms.kevi</groupId>
     <artifactId>plotplugin</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>cn.powernukkitx</groupId>
             <artifactId>powernukkitx</artifactId>
-            <version>1.19.20-r1</version>
+            <version>1.19.20-r4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/ms/kevi/plotplugin/manager/PlotManager.java b/src/main/java/ms/kevi/plotplugin/manager/PlotManager.java
@@ -127,8 +127,8 @@ public Plot getMergedPlot(int x, int z) {
         final int plotSize = this.levelSettings.getPlotSize();
         final int totalSize = this.levelSettings.getTotalSize();
 
-        final int idX = x / totalSize;
-        final int idZ = z / totalSize;
+        final int idX = x >= 0 ? x / totalSize : (x / totalSize) - 1;
+        final int idZ = x >= 0 ? z / totalSize : (z / totalSize) - 1;
 
         final int difX = x >= 0 ? x % totalSize : Math.abs((x - plotSize + 1) % totalSize);
         final int difZ = z >= 0 ? z % totalSize : Math.abs((z - plotSize + 1) % totalSize);
@@ -159,8 +159,8 @@ private PlotId getPlotIdByPos(int x, int z) {
         final int plotSize = this.levelSettings.getPlotSize();
         final int totalSize = plotSize + this.levelSettings.getRoadSize();
 
-        final int idX = x / totalSize;
-        final int idZ = z / totalSize;
+        final int idX = x >= 0 ? x / totalSize : (x / totalSize) - 1;
+        final int idZ = x >= 0 ? z / totalSize : (z / totalSize) - 1;
 
         final int difX = x >= 0 ? x % totalSize : Math.abs((x - plotSize + 1) % totalSize);
         final int difZ = z >= 0 ? z % totalSize : Math.abs((z - plotSize + 1) % totalSize);

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Plots
-version: "1.2.0"
+version: "1.2.1"
 api: [ "1.0.13" ]
 author: Kevims
 main: ms.kevi.plotplugin.PlotPlugin