From b45224fff0aade833a8c7c385ea912f37249b1d3 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Fri, 5 Aug 2011 14:06:35 -0500 Subject: [PATCH] Added handling for potential null strings in "territoryNeutralDenyCommands" and "territoryEnemyDenyCommands" --- .../factions/listeners/FactionsPlayerListener.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 5644de4a..f2b24e67 100644 --- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -434,7 +434,12 @@ public class FactionsPlayerListener extends PlayerListener{ Iterator iter = Conf.territoryNeutralDenyCommands.iterator(); String cmdCheck; while (iter.hasNext()) { - cmdCheck = iter.next().toLowerCase(); + cmdCheck = iter.next(); + if (cmdCheck == null) { + continue; + } + + cmdCheck = cmdCheck.toLowerCase(); if (fullCmd.startsWith(cmdCheck) || shortCmd.startsWith(cmdCheck)) { me.sendMessage("You can't use the command \""+fullCmd+"\" in neutral territory."); return true; @@ -449,7 +454,12 @@ public class FactionsPlayerListener extends PlayerListener{ Iterator iter = Conf.territoryEnemyDenyCommands.iterator(); String cmdCheck; while (iter.hasNext()) { - cmdCheck = iter.next().toLowerCase(); + cmdCheck = iter.next(); + if (cmdCheck == null) { + continue; + } + + cmdCheck = cmdCheck.toLowerCase(); if (fullCmd.startsWith(cmdCheck) || shortCmd.startsWith(cmdCheck)) { me.sendMessage("You can't use the command \""+fullCmd+"\" in enemy territory."); return true;