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

Fix for /f money command not being shown in help, and some other minor cleanup

Browse Source
This commit is contained in:
Brettflan 2011-10-16 09:11:29 -05:00
parent 0b04c95990
commit e3284a5ee1
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -1,5 +1,5 @@
name: Factions name: Factions
version: 1.6.0_dev version: 1.5.9_beta
main: com.massivecraft.factions.P main: com.massivecraft.factions.P
authors: [Olof Larsson, Brett Flannigan] authors: [Olof Larsson, Brett Flannigan]
softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, nChat, ChatManager, CAPI, AuthMe, Register, Spout, WorldEdit, WorldGuard] softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, nChat, ChatManager, CAPI, AuthMe, Register, Spout, WorldEdit, WorldGuard]

5
src/com/massivecraft/factions/cmd/CmdHelp.java
View File

@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd;
import java.util.ArrayList; import java.util.ArrayList;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
@ -83,13 +84,13 @@ public class CmdHelp extends FCommand
pageLines.add( p.cmdBase.cmdSethome.getUseageTemplate(true) ); pageLines.add( p.cmdBase.cmdSethome.getUseageTemplate(true) );
helpPages.add(pageLines); helpPages.add(pageLines);
if (Econ.shouldBeUsed()) if (Econ.isSetup() && Conf.bankEnabled)
{ {
pageLines = new ArrayList<String>(); pageLines = new ArrayList<String>();
pageLines.add( "" ); pageLines.add( "" );
pageLines.add( p.txt.parse("<i>Your faction has a bank which is used to pay for certain" )); pageLines.add( p.txt.parse("<i>Your faction has a bank which is used to pay for certain" ));
pageLines.add( p.txt.parse("<i>things, so it will need to have money deposited into it." )); pageLines.add( p.txt.parse("<i>things, so it will need to have money deposited into it." ));
pageLines.add( p.txt.parse("<i>To lear more use the money command." )); pageLines.add( p.txt.parse("<i>To learn more, use the money command." ));
pageLines.add( "" ); pageLines.add( "" );
pageLines.add( p.cmdBase.cmdMoney.getUseageTemplate(true) ); pageLines.add( p.cmdBase.cmdMoney.getUseageTemplate(true) );
pageLines.add( "" ); pageLines.add( "" );

4
src/com/massivecraft/factions/cmd/FCommand.java
View File

@ -70,13 +70,13 @@ public abstract class FCommand extends MCommand<P>
if (this.isMoneyCommand && ! Conf.econEnabled) if (this.isMoneyCommand && ! Conf.econEnabled)
{ {
msg("<b>Faction economy features are diabled on this server."); msg("<b>Faction economy features are disabled on this server.");
return false; return false;
} }
if (this.isMoneyCommand && ! Conf.bankEnabled) if (this.isMoneyCommand && ! Conf.bankEnabled)
{ {
msg("<b>The faction bank system is diabled on this server."); msg("<b>The faction bank system is disabled on this server.");
return false; return false;
} }

5
src/com/massivecraft/factions/integration/Econ.java
View File

@ -50,12 +50,11 @@ public class Econ
{ {
register = (Register)plug; register = (Register)plug;
P.p.log("Economy integration through register successful."); P.p.log("Economy integration through Register plugin successful.");
if ( ! Conf.econEnabled) if ( ! Conf.econEnabled)
{
P.p.log("NOTE: Economy is disabled. Enable in conf \"econEnabled\": true"); P.p.log("NOTE: Economy is disabled. Enable in conf \"econEnabled\": true");
} }
}
else else
{ {
P.p.log("Economy integration is "+(Conf.econEnabled ? "enabled, but" : "disabled, and")+" the plugin \"Register\" is not installed."); P.p.log("Economy integration is "+(Conf.econEnabled ? "enabled, but" : "disabled, and")+" the plugin \"Register\" is not installed.");