From 17d358f8fe432bb9866bd3b83deae8a49d3e4c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= <sauilitired@gmail.com>
Date: Thu, 23 Jul 2020 14:11:34 +0200
Subject: [PATCH] Fix plot ID issues

---
 .../com/plotsquared/core/plot/PlotId.java     | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotId.java b/Core/src/main/java/com/plotsquared/core/plot/PlotId.java
index 27004ba3c..d74d7aeec 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/PlotId.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/PlotId.java
@@ -36,7 +36,7 @@ import java.util.Iterator;
  * Plot (X,Y) tuples for plot locations
  * within a plot area
  */
-public class PlotId {
+public final class PlotId {
 
     private final int x;
     private final int y;
@@ -48,7 +48,7 @@ public class PlotId {
      * @param x The plot x coordinate
      * @param y The plot y coordinate
      */
-    private PlotId(int x, int y) {
+    private PlotId(final int x, final int y) {
         this.x = x;
         this.y = y;
         this.hash = (this.getX() << 16) | (this.getY() & 0xFFFF);
@@ -61,20 +61,21 @@ public class PlotId {
      * @param y The plot y coordinate
      */
     @Nonnull public static PlotId of(final int x, final int y) {
-        return PlotId.of(x, y);
+        return new PlotId(x, y);
     }
 
     /**
      * Get a Plot Id based on a string
      *
      * @param string to create id from
-     * @return the PlotId representation of the arguement
+     * @return the PlotId representation of the argument
      * @throws IllegalArgumentException if the string does not contain a valid PlotId
      */
-    @Nonnull public static PlotId fromString(@Nonnull String string) {
-        PlotId plot = fromStringOrNull(string);
-        if (plot == null)
+    @Nonnull public static PlotId fromString(@Nonnull final String string) {
+        final PlotId plot = fromStringOrNull(string);
+        if (plot == null) {
             throw new IllegalArgumentException("Cannot create PlotID. String invalid.");
+        }
         return plot;
     }
 
@@ -84,8 +85,8 @@ public class PlotId {
      * @param string ID string
      * @return Plot ID, or {@code null} if none could be parsed
      */
-    @Nullable public static PlotId fromStringOrNull(@Nonnull String string) {
-        String[] parts = string.split("[;,.]");
+    @Nullable public static PlotId fromStringOrNull(@Nonnull final String string) {
+        final String[] parts = string.split("[;,.]");
         if (parts.length < 2) {
             return null;
         }
@@ -94,7 +95,7 @@ public class PlotId {
         try {
             x = Integer.parseInt(parts[0]);
             y = Integer.parseInt(parts[1]);
-        } catch (NumberFormatException ignored) {
+        } catch (final NumberFormatException ignored) {
             return null;
         }
         return of(x, y);
@@ -126,7 +127,7 @@ public class PlotId {
      * @return X component
      */
     public int getX() {
-        return this.getX();
+        return this.x;
     }
 
     /**
@@ -135,7 +136,7 @@ public class PlotId {
      * @return Y component
      */
     public int getY() {
-        return this.getY();
+        return this.y;
     }
 
     /**
@@ -144,8 +145,8 @@ public class PlotId {
      * @return Next plot ID
      */
     @Nonnull public PlotId getNextId() {
-        int absX = Math.abs(x);
-        int absY = Math.abs(y);
+        final int absX = Math.abs(x);
+        final int absY = Math.abs(y);
         if (absX > absY) {
             if (x > 0) {
                 return PlotId.of(x, y + 1);