Ensure BlockUtil has NPE checks on player profiles

Author: espidev

src/main/java/dev/espi/protectionstones/utils/BlockUtil.java

@@ -69,12 +69,15 @@ public static String getProtectBlockType(ItemStack i) {
 
             // PLAYER_HEAD:base64
             PlayerProfile offlineProfile = sm.getOwnerProfile();
-            if (ProtectionStones.getBlockOptions("PLAYER_HEAD:" +offlineProfile.getUniqueId()) != null) {
-                return Material.PLAYER_HEAD + ":" +offlineProfile.getUniqueId();
+            if (offlineProfile == null) {
+                return Material.PLAYER_HEAD.toString();
+            }
+            if (ProtectionStones.getBlockOptions("PLAYER_HEAD:" + offlineProfile.getUniqueId()) != null) {
+                return Material.PLAYER_HEAD + ":" + offlineProfile.getUniqueId();
             }
 
             // PLAYER_HEAD:name
-            return Material.PLAYER_HEAD + ":" + offlineProfile.getName(); // return name if it doesn't exist
+            return Material.PLAYER_HEAD + ":" + offlineProfile.getName();
         }
         return i.getType().toString();
     }
@@ -85,16 +88,15 @@ public static String getProtectBlockType(Block block) {
             Skull s = (Skull) block.getState();
             if (s.hasOwner() && isOwnedSkullTypeConfigured()) {
                 PlayerProfile offlineProfile = s.getOwnerProfile();
+                if (offlineProfile == null) {
+                    return Material.PLAYER_HEAD.toString();
+                }
                 if (ProtectionStones.getBlockOptions("PLAYER_HEAD:" + offlineProfile.getUniqueId()) != null) {
-                    // PLAYER_HEAD:base64
                     return Material.PLAYER_HEAD + ":" + offlineProfile.getUniqueId();
-                } else {
-                    // PLAYER_HEAD:name
-                    return Material.PLAYER_HEAD + ":" + offlineProfile.getName(); // return name if doesn't exist
                 }
-            } else { // PLAYER_HEAD
-                return Material.PLAYER_HEAD.toString();
+                return Material.PLAYER_HEAD + ":" + offlineProfile.getName();
             }
+            return Material.PLAYER_HEAD.toString();
         } else if (block.getType() == Material.CREEPER_WALL_HEAD) {
             return Material.CREEPER_HEAD.toString();
         } else if (block.getType() == Material.DRAGON_WALL_HEAD) {
@@ -201,4 +203,4 @@ public static String getUUIDFromBase64PS(PSProtectBlock b) {
         // see github issue #126
         return new UUID(base64.hashCode(), base64.hashCode()).toString();
     }
-}
+}