From 44f43012399dacef6c6be1a26148659cd938f6b5 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Tue, 16 May 2023 12:39:55 -0400
Subject: [PATCH] Fix Permission crash

---
 build.gradle                                     |  2 +-
 src/main/java/kamkeel/developer/Developer.java   | 16 ++++++++++++----
 src/main/java/noppes/npcs/CustomNpcs.java        |  2 ++
 .../java/noppes/npcs/CustomNpcsPermissions.java  | 14 +++++++++-----
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3e066b644..102ce32f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ configurations {
 
 apply plugin: 'forge'
 
-version = "1.8.2"
+version = "1.8.2-v2"
 group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "CustomNPC-Plus"
 
diff --git a/src/main/java/kamkeel/developer/Developer.java b/src/main/java/kamkeel/developer/Developer.java
index 85373abd6..d801cda4a 100644
--- a/src/main/java/kamkeel/developer/Developer.java
+++ b/src/main/java/kamkeel/developer/Developer.java
@@ -1,14 +1,16 @@
 package kamkeel.developer;
 
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.UUID;
 
 public class Developer {
 
-    public static ArrayList<UUID> Universal = new ArrayList<>();
-    public static ArrayList<UUID> ScriptUser = new ArrayList<>();
-    public static ArrayList<UUID> WandUser = new ArrayList<>();
-    public static ArrayList<UUID> QuestMaker = new ArrayList<>();
+    public static HashSet<UUID> Universal = new HashSet<>();
+    public static HashSet<UUID> ScriptUser = new HashSet<>();
+    public static HashSet<UUID> WandUser = new HashSet<>();
+    public static HashSet<UUID> QuestMaker = new HashSet<>();
     public static Developer instance;
 
     public Developer(){
@@ -18,10 +20,16 @@ public class Developer {
     }
 
     public boolean hasUniversal(UUID uuid){
+        if(Universal == null){
+            Universal = new HashSet<>();
+        }
         return Universal.contains(uuid);
     }
 
     public boolean hasScriptUser(UUID uuid){
+        if(ScriptUser == null){
+            ScriptUser = new HashSet<>();
+        }
         return ScriptUser.contains(uuid);
     }
 
diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java
index 8c48dc196..417e40675 100644
--- a/src/main/java/noppes/npcs/CustomNpcs.java
+++ b/src/main/java/noppes/npcs/CustomNpcs.java
@@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import foxz.command.CommandNoppes;
 import kamkeel.command.CommandKamkeel;
+import kamkeel.developer.Developer;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockIce;
 import net.minecraft.block.BlockLeavesBase;
@@ -166,6 +167,7 @@ public class CustomNpcs {
         ForgeChunkManager.setForcedChunkLoadingCallback(this, new ChunkController());
 
         new CustomNpcsPermissions();
+        new Developer();
 
         PixelmonHelper.load();
     }
diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java
index a0ef3d022..f96480cff 100644
--- a/src/main/java/noppes/npcs/CustomNpcsPermissions.java
+++ b/src/main/java/noppes/npcs/CustomNpcsPermissions.java
@@ -75,11 +75,15 @@ public class CustomNpcsPermissions{
 	}
 	
 	public static boolean hasPermission(EntityPlayer player, Permission permission){
-		if(Developer.instance.hasUniversal(player.getUniqueID())){
-			return true;
-		}
-		if(Instance.bukkit != null){
-			return Instance.bukkitPermission(player.getCommandSenderName(), permission.name);
+		if(player != null){
+			if(Developer.instance.hasUniversal(player.getUniqueID())){
+				return true;
+			}
+			if(permission != null){
+				if(Instance.bukkit != null){
+					return Instance.bukkitPermission(player.getCommandSenderName(), permission.name);
+				}
+			}
 		}
 		return true;
 	}