Fix NPE in MessageManager

Double0negative · Sep 10, 2013 · 53d356e · 53d356e
1 parent 2e77cb5
commit 53d356e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/mcsg/survivalgames/Game.java b/src/main/java/org/mcsg/survivalgames/Game.java
@@ -579,7 +579,7 @@ public void killPlayer(Player p, boolean left) {
 						}
 						break;
 					default:
-						msgFall(PrefixType.INFO, "death."+p.getLastDamageCause().getCause(), 
+						msgFall(PrefixType.INFO, "death."+p.getLastDamageCause().getCause().name(), 
 								"player-"+(SurvivalGames.auth.contains(p.getName()) ? ChatColor.DARK_RED + "" + ChatColor.BOLD : "") + p.getName(), 
 								"killer-"+p.getLastDamageCause().getCause());
 						pk = new PlayerKilledEvent(p, this, null, p.getLastDamageCause().getCause());

diff --git a/src/main/java/org/mcsg/survivalgames/MessageManager.java b/src/main/java/org/mcsg/survivalgames/MessageManager.java
@@ -50,7 +50,7 @@ public void setup() {
 	public void sendFMessage(PrefixType type, String input, Player player, String ... args) {
 		String msg = SettingsManager.getInstance().getMessageConfig().getString("messages."+input);
 		boolean enabled = SettingsManager.getInstance().getMessageConfig().getBoolean("messages."+input+"_enabled", true);
-		if(msg == null)player.sendMessage(ChatColor.RED+"Failed to load message for messages."+input);
+		if(msg == null){player.sendMessage(ChatColor.RED+"Failed to load message for messages."+input); return;}
 		if(!enabled)return;
 		if(args != null && args.length != 0){msg = MessageUtil.replaceVars(msg, args);}
 		msg = MessageUtil.replaceColors(msg);

diff --git a/src/main/java/org/mcsg/survivalgames/util/MessageUtil.java b/src/main/java/org/mcsg/survivalgames/util/MessageUtil.java
@@ -12,7 +12,9 @@ public class MessageUtil {
 
 
 	public static String replaceColors(String s){
-	//	System.out.println(s);
+		if(s == null){
+			return null;
+		}
 		return s.replaceAll("(&([a-fk-or0-9]))", "\u00A7$2");
 	}