From 9546cc42b2486ea6cf3df967fcc489a04bec392c Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 22 May 2012 02:57:54 -0700 Subject: [PATCH] Redundant --- Changelog.txt | 2 +- .../gmail/nossr50/listeners/PlayerListener.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 5f9975756..76ab990fc 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -9,7 +9,7 @@ Key: Version 1.3.08 + Added more notifications about Vampirism and Hardcore mode on player death - + Added informative information about Hardcore mode when joining a server running Hardcore mode + + Added information about Hardcore mode when joining a server running Hardcore mode + Added new hidden.yml inside the jar for very sensitive config options for advanced users + Added option to disable Chunklets for servers which do not have doubledrops and do not care about xp farming + Added new "Max_Seconds" setting in config.yml to limit the max time of abilities diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index bdd29720f..cd6481731 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -164,17 +164,19 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); - + if (Config.getInstance().getMOTDEnabled() && Permissions.getInstance().motd(player)) { - player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.YELLOW+"Running version " + ChatColor.DARK_AQUA + plugin.getDescription().getVersion()); //TODO: Locale + String prefix = ChatColor.GOLD+"[mcMMO] "; + + player.sendMessage(prefix+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()+"%"); + player.sendMessage(prefix+ChatColor.DARK_RED+"Hardcore & Vampirism enabled."); + player.sendMessage(prefix+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(prefix+ChatColor.DARK_RED+"Hardcore enabled."); + player.sendMessage(prefix+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"%"); } }