diff --git a/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java b/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java
index 535bc8ad..dc292e52 100644
--- a/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java
+++ b/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java
@@ -179,7 +179,7 @@ public class DynmapPlugin {
             int idx = bsids.getId(bs);
             if (idx >= stateByID.length) {
                 int plen = stateByID.length;
-                stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
+    			stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%    			
                 Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
             }
             Block b = bs.getBlock();
@@ -330,7 +330,7 @@ public class DynmapPlugin {
 
     boolean hasPerm(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
+        if ((psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.has(psender, permission);
@@ -338,7 +338,7 @@ public class DynmapPlugin {
 
     boolean hasPermNode(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission))) {
+        if ((psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.hasPermissionNode(psender, permission);
diff --git a/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java b/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java
index 278bc9d2..641d084c 100644
--- a/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java
+++ b/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java
@@ -179,7 +179,7 @@ public class DynmapPlugin {
             int idx = bsids.getId(bs);
             if (idx >= stateByID.length) {
                 int plen = stateByID.length;
-                stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
+    			stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%    			
                 Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
             }
             Block b = bs.getBlock();
@@ -330,7 +330,7 @@ public class DynmapPlugin {
 
     boolean hasPerm(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
+        if ((psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.has(psender, permission);
@@ -338,7 +338,7 @@ public class DynmapPlugin {
 
     boolean hasPermNode(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission))) {
+        if ((psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.hasPermissionNode(psender, permission);
diff --git a/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java b/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
index 702ff5d3..6dd33db3 100644
--- a/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
+++ b/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
@@ -177,7 +177,7 @@ public class DynmapPlugin {
             int idx = bsids.getId(bs);
             if (idx >= stateByID.length) {
                 int plen = stateByID.length;
-                stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
+    			stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%    			
                 Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
             }
             Block b = bs.getBlock();
@@ -328,7 +328,7 @@ public class DynmapPlugin {
 
     boolean hasPerm(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
+        if ((psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.has(psender, permission);
@@ -336,7 +336,7 @@ public class DynmapPlugin {
 
     boolean hasPermNode(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission))) {
+        if ((psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.hasPermissionNode(psender, permission);
diff --git a/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java b/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
index e2b24df7..79e2d6f7 100644
--- a/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
+++ b/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
@@ -177,7 +177,7 @@ public class DynmapPlugin {
             int idx = bsids.getRawId(bs);
             if (idx >= stateByID.length) {
                 int plen = stateByID.length;
-                stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
+    			stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%    			
                 Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
             }
             Block b = bs.getBlock();
@@ -314,7 +314,7 @@ public class DynmapPlugin {
 
     boolean hasPerm(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
+        if ((psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.has(psender, permission);
@@ -322,7 +322,7 @@ public class DynmapPlugin {
 
     boolean hasPermNode(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission))) {
+        if ((psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.hasPermissionNode(psender, permission);
diff --git a/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java b/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java
index f752d0ae..1bbc77bd 100644
--- a/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java
+++ b/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java
@@ -177,7 +177,7 @@ public class DynmapPlugin {
             int idx = bsids.getRawId(bs);
             if (idx >= stateByID.length) {
                 int plen = stateByID.length;
-                stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
+    			stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%    			
                 Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
             }
             Block b = bs.getBlock();
@@ -314,7 +314,7 @@ public class DynmapPlugin {
 
     boolean hasPerm(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
+        if ((psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.has(psender, permission);
@@ -322,7 +322,7 @@ public class DynmapPlugin {
 
     boolean hasPermNode(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission))) {
+        if ((psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.hasPermissionNode(psender, permission);
diff --git a/fabric-1.17/src/main/java/org/dynmap/fabric_1_17/DynmapPlugin.java b/fabric-1.17/src/main/java/org/dynmap/fabric_1_17/DynmapPlugin.java
index 323418c2..99949fc3 100644
--- a/fabric-1.17/src/main/java/org/dynmap/fabric_1_17/DynmapPlugin.java
+++ b/fabric-1.17/src/main/java/org/dynmap/fabric_1_17/DynmapPlugin.java
@@ -178,7 +178,7 @@ public class DynmapPlugin {
             int idx = bsids.getRawId(bs);
             if (idx >= stateByID.length) {
                 int plen = stateByID.length;
-                stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
+    			stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%    			
                 Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
             }
             Block b = bs.getBlock();
@@ -315,7 +315,7 @@ public class DynmapPlugin {
 
     boolean hasPerm(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
+        if ((psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.has(psender, permission);
@@ -323,7 +323,7 @@ public class DynmapPlugin {
 
     boolean hasPermNode(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
+        if ((psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.hasPermissionNode(psender, permission);