Merge pull request #232 from PrisonTeam/bleeding.alpha12

v3.3.0-alpha.12
PrisonTeam · Jun 25, 2022 · df4b26c · df4b26c
2 parents 2878e56 + bce7459
commit df4b26c
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 39 deletions.
diff --git a/docs/changelog_v3.3.x.md b/docs/changelog_v3.3.x.md
@@ -11,7 +11,11 @@ These build logs represent the work that has been going on within prison.
 
 
 
-# 3.3.0-alpha.11j 2022-06-20
+# 3.3.0-alpha.12 2022-06-25
+
+
+* **v3.3.0-alpha.12 2022-06-25**
+
 
 
 * **v3.3.0-alpha.11k 2022-06-20**

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 ## # This is actually the "correct" place to define the version for the project.
 ## # Used within build.gradle with ${project.version}.
 ## # Can be overridden on the command line: gradle -Pversion=3.2.1-alpha.3
-version=3.3.0-alpha.11k
+version=3.3.0-alpha.12
 
 
 

diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/SpigotPlaceholders.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/SpigotPlaceholders.java
@@ -302,43 +302,46 @@ private String processPlaceholderHavePlaceholderKey( PlaceholderIdentifier ident
 
     	PlaceHolderKey placeHolderKey = identifier.getPlaceholderKey(); 
 
-		if ( mm != null && 
-				(placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.MINES ) ||
-				placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.STATSMINES ) ||
-				placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.MINEPLAYERS ) ||
-				placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.PLAYERBLOCKS ) 
-			)) {
-
-			if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
-
-				mm.getTranslateMinesPlaceholder(identifier);
-			}
-
-		}
-		else if ( pm != null && 
-					(placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.PLAYER ) || 
-					placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.LADDERS )
-				)) {
-
-			if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
-
-				pm.getTranslatePlayerPlaceHolder( identifier );
-			}
-
-		}
-		else if ( rm != null && 
-					(placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.RANKS ) || 
-					placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.RANKPLAYERS ) ||
-					placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.STATSRANKS ) ||
-					placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.STATSPLAYERS ) 
-				)) {
-
-			if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
-
-				rm.getTranslateRanksPlaceHolder( identifier );
-			}
-
-		}
+    	if ( placeHolderKey != null && placeHolderKey.getPlaceholder() != null ) {
+
+    		if ( mm != null && 
+    				(placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.MINES ) ||
+    						placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.STATSMINES ) ||
+    						placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.MINEPLAYERS ) ||
+    						placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.PLAYERBLOCKS ) 
+    						)) {
+
+    			if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
+
+    				mm.getTranslateMinesPlaceholder(identifier);
+    			}
+
+    		}
+    		else if ( pm != null && 
+    				(placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.PLAYER ) || 
+    						placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.LADDERS )
+    						)) {
+
+    			if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
+
+    				pm.getTranslatePlayerPlaceHolder( identifier );
+    			}
+
+    		}
+    		else if ( rm != null && 
+    				(placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.RANKS ) || 
+    						placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.RANKPLAYERS ) ||
+    						placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.STATSRANKS ) ||
+    						placeHolderKey.getPlaceholder().hasFlag( PlaceholderFlags.STATSPLAYERS ) 
+    						)) {
+
+    			if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
+
+    				rm.getTranslateRanksPlaceHolder( identifier );
+    			}
+
+    		}
+    	}
 
 
     	return identifier.getText();