Spigot utils: saw a rare situation where a NPE happened when prison h…

…ad custom blocks setup, but the plugin was removed. This prevents a NPE if the backing 3rd plugin goes away.
PrisonTeam · May 31, 2024 · 48fb165 · 48fb165
1 parent dea241f
commit 48fb165
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/docs/changelog_v3.3.x.md b/docs/changelog_v3.3.x.md
@@ -14,7 +14,12 @@
 These change logs represent the work that has been going on within prison. 
 
 
-# 3.3.0-alpha.18a 2024-05-29
+# 3.3.0-alpha.18a 2024-05-30
+
+
+* **Spigot utils: saw a rare situation where a NPE happened when prison had custom blocks setup, but the plugin was removed.**
+This prevents a NPE if the backing 3rd plugin goes away.
+
 
 
 * **Mine reset notifications: Forgot to add support for 'server' notification mode.**

diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/SpigotUtil.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/SpigotUtil.java
@@ -178,11 +178,14 @@ public static ItemStack getItemStack( XMaterial xMaterial, int amount ) {
 	public static SpigotItemStack getSpigotItemStackXMat( XMaterial xMaterial, int amount ) {
 		SpigotItemStack itemStack = null;
 
-		try {
-			itemStack = new SpigotItemStack( getItemStack( xMaterial, amount ) );
-		} 
-		catch (PrisonItemStackNotSupportedRuntimeException e) {
-			// ignore
+		if ( xMaterial != null ) {
+
+			try {
+				itemStack = new SpigotItemStack( getItemStack( xMaterial, amount ) );
+			} 
+			catch (PrisonItemStackNotSupportedRuntimeException e) {
+				// ignore
+			}
 		}
 
 		return itemStack;