From 6ea962c1fa64b6f6b4b7b5361b794bb07412322f Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 22 May 2012 02:45:42 -0700 Subject: [PATCH] Changing the MOTD again, modified a few messages. Now hardcore mode only tells you about itself when motd is enabled. --- .../nossr50/listeners/PlayerListener.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index bc63e5592..bdd29720f 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -166,8 +166,19 @@ public class PlayerListener implements Listener { Player player = event.getPlayer(); if (Config.getInstance().getMOTDEnabled() && Permissions.getInstance().motd(player)) { - player.sendMessage(ChatColor.GOLD + "Server is running " + ChatColor.GREEN + plugin.getName() + " " + plugin.getDescription().getVersion()); //TODO: Locale - player.sendMessage(ChatColor.GOLD + "http://www.mcmmo.info" + ChatColor.DARK_AQUA + " - mcMMO Website & Forums"); //TODO: Locale + player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.YELLOW+"Running version " + ChatColor.DARK_AQUA + plugin.getDescription().getVersion()); //TODO: Locale + + if(Config.getInstance().getHardcoreEnabled()) { + if(Config.getInstance().getHardcoreVampirismEnabled()) { + player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.DARK_RED+"Hardcore & Vampirism enabled."); + player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"% "+ChatColor.DARK_AQUA+"Vampirism Stat Leech: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreVampirismStatLeechPercentage()+"%"); + } else { + player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.DARK_RED+"Hardcore enabled."); + player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"%"); + } + } + + player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.GREEN+ "http://www.mcmmo.info" + ChatColor.YELLOW + " - mcMMO Website & Forums"); //TODO: Locale //player.sendMessage(LocaleLoader.getString("mcMMO.MOTD", new Object[] {plugin.getDescription().getVersion()})); //player.sendMessage(LocaleLoader.getString("mcMMO.Website")); } @@ -177,15 +188,7 @@ public class PlayerListener implements Listener { player.sendMessage(LocaleLoader.getString("XPRate.Event", new Object[] {Config.getInstance().xpGainMultiplier})); } - if(Config.getInstance().getHardcoreEnabled()) { - if(Config.getInstance().getHardcoreVampirismEnabled()) { - player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.DARK_RED+"Hardcore & Vampirism enabled."); - player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"% "+ChatColor.DARK_AQUA+"Vampirism Stat Leech: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreVampirismStatLeechPercentage()+"%"); - } else { - player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.DARK_RED+"Hardcore enabled."); - player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"%"); - } - } + } /**