protection type can sometimes resolve to null, somehow?

Hidendra · Jun 30, 2012 · 41cce06 · 41cce06
1 parent fbfcc47
commit 41cce06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/main/java/com/griefcraft/lwc/LWC.java b/src/main/java/com/griefcraft/lwc/LWC.java
@@ -96,7 +96,6 @@
 import com.griefcraft.modules.setup.BaseSetupModule;
 import com.griefcraft.modules.setup.DatabaseSetupModule;
 import com.griefcraft.modules.setup.LimitsSetup;
-import com.griefcraft.modules.pluginsupport.Towny;
 import com.griefcraft.modules.unlock.UnlockModule;
 import com.griefcraft.scripting.Module;
 import com.griefcraft.scripting.ModuleLoader;
@@ -595,11 +594,16 @@ public boolean enforceAccess(Player player, Protection protection, Block block,
                 }
 
                 String blockName = materialToString(block);
+                String protectionTypeToString = parser.parseMessage(protection.typeToString().toLowerCase());
+
+                if (protectionTypeToString == null) {
+                    protectionTypeToString = "Unknown";
+                }
 
                 if (parser.parseMessage("protection." + blockName.toLowerCase() + ".notice.protected") != null) {
-                    sendLocale(player, "protection." + blockName.toLowerCase() + ".notice.protected", "type", parser.parseMessage(protection.typeToString().toLowerCase()), "block", blockName, "owner", owner);
+                    sendLocale(player, "protection." + blockName.toLowerCase() + ".notice.protected", "type", protectionTypeToString, "block", blockName, "owner", owner);
                 } else {
-                    sendLocale(player, "protection.general.notice.protected", "type", parser.parseMessage(protection.typeToString().toLowerCase()), "block", blockName, "owner", owner);
+                    sendLocale(player, "protection.general.notice.protected", "type", protectionTypeToString, "block", blockName, "owner", owner);
                 }
             }
         }

diff --git a/src/main/java/com/griefcraft/lwc/SimpleMessageParser.java b/src/main/java/com/griefcraft/lwc/SimpleMessageParser.java
@@ -64,15 +64,8 @@ public String parseMessage(String key, Object... args) {
 
         // add the arguments to the cache key
         if (args != null && args.length > 0) {
-            int index = 0;
             for (Object argument : args) {
-                if (argument == null) {
-                    System.out.println("Argument is null at index " + index);
-                } else {
-                    cacheKey += argument.toString();
-                }
-
-                index ++;
+                cacheKey += argument.toString();
             }
         }