Merge pull request #1023 from TonytheMacaroni/load-check

TonytheMacaroni · web-flow · commit 69d0a2b19faa · 2025-05-02T21:42:44.000-04:00
Check if plugin instance is null in MagicSpells#isLoaded
diff --git a/core/src/main/java/com/nisovin/magicspells/MagicSpells.java b/core/src/main/java/com/nisovin/magicspells/MagicSpells.java
@@ -1024,7 +1024,7 @@ public static void resetEffectlib() {
 	}
 
 	public static boolean isLoaded() {
-		return plugin.loaded;
+		return plugin != null && plugin.loaded;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1024,7 +1024,7 @@ public static void resetEffectlib() {`
`1024`	`1024`	`}`
`1025`	`1025`
`1026`	`1026`	`public static boolean isLoaded() {`
`1027`		`- return plugin.loaded;`
	`1027`	`+ return plugin != null && plugin.loaded;`
`1028`	`1028`	`}`
`1029`	`1029`
`1030`	`1030`	`/**`