Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brettflan 2011-09-12 22:36:59 -05:00
parent f40b241bc4
commit 877cfe914d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/commands/FCommandChat.java
View File

@ -13,8 +13,8 @@ public class FCommandChat extends FBaseCommand {
@Override @Override
public void perform() { public void perform() {
if ( ! Conf.factionOnlyChat ) if ( ! Conf.factionOnlyChat ) {
{ sendMessage("Faction-only chat is disabled on this server.");
return; return;
} }
if ( ! assertHasFaction()) { if ( ! assertHasFaction()) {

5
src/com/massivecraft/factions/commands/FCommandHelp.java
View File

@ -103,11 +103,11 @@ public class FCommandHelp extends FBaseCommand {
helpPages.add(pageLines); helpPages.add(pageLines);
pageLines = new ArrayList<String>(); pageLines = new ArrayList<String>();
pageLines.add( new FCommandDisband().getUseageTemplate() );
pageLines.add("");
pageLines.add( new FCommandRelationAlly().getUseageTemplate() ); pageLines.add( new FCommandRelationAlly().getUseageTemplate() );
pageLines.add( new FCommandRelationNeutral().getUseageTemplate() ); pageLines.add( new FCommandRelationNeutral().getUseageTemplate() );
pageLines.add( new FCommandRelationEnemy().getUseageTemplate() ); pageLines.add( new FCommandRelationEnemy().getUseageTemplate() );
pageLines.add("");
pageLines.add("");
pageLines.add("Set the relation you WISH to have with another faction."); 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("Your default relation with other factions will be neutral.");
pageLines.add("If BOTH factions choose \"ally\" you will be allies."); pageLines.add("If BOTH factions choose \"ally\" you will be allies.");
@ -140,7 +140,6 @@ public class FCommandHelp extends FBaseCommand {
pageLines = new ArrayList<String>(); pageLines = new ArrayList<String>();
pageLines.add("Finally some commands for the server admins:"); pageLines.add("Finally some commands for the server admins:");
pageLines.add( new FCommandDisband().getUseageTemplate() );
pageLines.add( new FCommandSafeclaim().getUseageTemplate() ); pageLines.add( new FCommandSafeclaim().getUseageTemplate() );
pageLines.add( new FCommandAutoSafeclaim().getUseageTemplate() ); pageLines.add( new FCommandAutoSafeclaim().getUseageTemplate() );
pageLines.add( new FCommandSafeunclaimall().getUseageTemplate() ); pageLines.add( new FCommandSafeunclaimall().getUseageTemplate() );