From 877cfe914ddfb3d0e37e691afd4770c18c4afb6a Mon Sep 17 00:00:00 2001 From: Brettflan Date: Mon, 12 Sep 2011 22:36:59 -0500 Subject: [PATCH] Added note when player tries to use faction chat when it's disabled, moved disband command in the Help listing out of the server-admin-only section since it can now be used by faction admins on their own factions --- src/com/massivecraft/factions/commands/FCommandChat.java | 4 ++-- src/com/massivecraft/factions/commands/FCommandHelp.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/massivecraft/factions/commands/FCommandChat.java b/src/com/massivecraft/factions/commands/FCommandChat.java index 57799879..ebf96a61 100644 --- a/src/com/massivecraft/factions/commands/FCommandChat.java +++ b/src/com/massivecraft/factions/commands/FCommandChat.java @@ -13,8 +13,8 @@ public class FCommandChat extends FBaseCommand { @Override public void perform() { - if ( ! Conf.factionOnlyChat ) - { + if ( ! Conf.factionOnlyChat ) { + sendMessage("Faction-only chat is disabled on this server."); return; } if ( ! assertHasFaction()) { diff --git a/src/com/massivecraft/factions/commands/FCommandHelp.java b/src/com/massivecraft/factions/commands/FCommandHelp.java index ae263906..34a40550 100644 --- a/src/com/massivecraft/factions/commands/FCommandHelp.java +++ b/src/com/massivecraft/factions/commands/FCommandHelp.java @@ -103,11 +103,11 @@ public class FCommandHelp extends FBaseCommand { helpPages.add(pageLines); pageLines = new ArrayList(); + pageLines.add( new FCommandDisband().getUseageTemplate() ); + pageLines.add(""); pageLines.add( new FCommandRelationAlly().getUseageTemplate() ); pageLines.add( new FCommandRelationNeutral().getUseageTemplate() ); pageLines.add( new FCommandRelationEnemy().getUseageTemplate() ); - pageLines.add(""); - pageLines.add(""); pageLines.add("Set the relation you WISH to have with another faction."); pageLines.add("Your default relation with other factions will be neutral."); pageLines.add("If BOTH factions choose \"ally\" you will be allies."); @@ -140,7 +140,6 @@ public class FCommandHelp extends FBaseCommand { pageLines = new ArrayList(); pageLines.add("Finally some commands for the server admins:"); - pageLines.add( new FCommandDisband().getUseageTemplate() ); pageLines.add( new FCommandSafeclaim().getUseageTemplate() ); pageLines.add( new FCommandAutoSafeclaim().getUseageTemplate() ); pageLines.add( new FCommandSafeunclaimall().getUseageTemplate() );