From 61bd37c99b448ce31f88e1f6b8c2fc168bc7a45c Mon Sep 17 00:00:00 2001 From: Brettflan Date: Sat, 15 Oct 2011 12:46:44 -0500 Subject: [PATCH] A bit of command help menu cleanup --- src/com/massivecraft/factions/cmd/CmdAutoClaim.java | 2 +- src/com/massivecraft/factions/cmd/CmdAutoSafeclaim.java | 2 +- src/com/massivecraft/factions/cmd/CmdAutoWarclaim.java | 6 ++---- src/com/massivecraft/factions/cmd/CmdBoom.java | 2 +- src/com/massivecraft/factions/cmd/CmdBypass.java | 2 +- src/com/massivecraft/factions/cmd/CmdHelp.java | 2 -- src/com/massivecraft/factions/cmd/CmdLock.java | 2 +- src/com/massivecraft/factions/cmd/CmdOpen.java | 2 +- src/com/massivecraft/factions/cmd/CmdSafeunclaimall.java | 2 +- src/com/massivecraft/factions/integration/Econ.java | 2 +- 10 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/com/massivecraft/factions/cmd/CmdAutoClaim.java b/src/com/massivecraft/factions/cmd/CmdAutoClaim.java index cd45cf8e..ca687029 100644 --- a/src/com/massivecraft/factions/cmd/CmdAutoClaim.java +++ b/src/com/massivecraft/factions/cmd/CmdAutoClaim.java @@ -12,7 +12,7 @@ public class CmdAutoClaim extends FCommand this.aliases.add("autoclaim"); //this.requiredArgs.add(""); - this.optionalArgs.put("on/off", "flipp"); + this.optionalArgs.put("on/off", "flip"); this.permission = Permission.AUTOCLAIM.node; this.disableOnLock = true; diff --git a/src/com/massivecraft/factions/cmd/CmdAutoSafeclaim.java b/src/com/massivecraft/factions/cmd/CmdAutoSafeclaim.java index bf87439c..f7ed9810 100644 --- a/src/com/massivecraft/factions/cmd/CmdAutoSafeclaim.java +++ b/src/com/massivecraft/factions/cmd/CmdAutoSafeclaim.java @@ -14,7 +14,7 @@ public class CmdAutoSafeclaim extends FCommand this.aliases.add("autosafe"); //this.requiredArgs.add(""); - this.optionalArgs.put("on/off", "flipp"); + this.optionalArgs.put("on/off", "flip"); this.permission = Permission.MANAGE_SAFE_ZONE.node; this.disableOnLock = true; diff --git a/src/com/massivecraft/factions/cmd/CmdAutoWarclaim.java b/src/com/massivecraft/factions/cmd/CmdAutoWarclaim.java index 33142f3e..a58e459c 100644 --- a/src/com/massivecraft/factions/cmd/CmdAutoWarclaim.java +++ b/src/com/massivecraft/factions/cmd/CmdAutoWarclaim.java @@ -12,10 +12,10 @@ public class CmdAutoWarclaim extends FCommand public CmdAutoWarclaim() { super(); - this.aliases.add("autosafe"); + aliases.add("autowar"); //this.requiredArgs.add(""); - this.optionalArgs.put("on/off", "flipp"); + this.optionalArgs.put("on/off", "flip"); this.permission = Permission.MANAGE_WAR_ZONE.node; this.disableOnLock = true; @@ -24,8 +24,6 @@ public class CmdAutoWarclaim extends FCommand senderMustBeMember = false; senderMustBeModerator = true; senderMustBeAdmin = false; - - aliases.add("autowar"); this.setHelpShort("Auto-claim land for the warzone"); } diff --git a/src/com/massivecraft/factions/cmd/CmdBoom.java b/src/com/massivecraft/factions/cmd/CmdBoom.java index 1f83c964..d3319bc3 100644 --- a/src/com/massivecraft/factions/cmd/CmdBoom.java +++ b/src/com/massivecraft/factions/cmd/CmdBoom.java @@ -11,7 +11,7 @@ public class CmdBoom extends FCommand this.aliases.add("noboom"); //this.requiredArgs.add(""); - this.optionalArgs.put("on/off", "flipp"); + this.optionalArgs.put("on/off", "flip"); this.permission = Permission.NO_BOOM.node; this.disableOnLock = true; diff --git a/src/com/massivecraft/factions/cmd/CmdBypass.java b/src/com/massivecraft/factions/cmd/CmdBypass.java index d9ba4abd..5e626d60 100644 --- a/src/com/massivecraft/factions/cmd/CmdBypass.java +++ b/src/com/massivecraft/factions/cmd/CmdBypass.java @@ -11,7 +11,7 @@ public class CmdBypass extends FCommand this.aliases.add("bypass"); //this.requiredArgs.add(""); - this.optionalArgs.put("on/off", "flipp"); + this.optionalArgs.put("on/off", "flip"); this.permission = Permission.BYPASS.node; this.disableOnLock = false; diff --git a/src/com/massivecraft/factions/cmd/CmdHelp.java b/src/com/massivecraft/factions/cmd/CmdHelp.java index a60a7c94..0f334a73 100644 --- a/src/com/massivecraft/factions/cmd/CmdHelp.java +++ b/src/com/massivecraft/factions/cmd/CmdHelp.java @@ -113,10 +113,8 @@ public class CmdHelp extends FCommand pageLines = new ArrayList(); pageLines.add( p.cmdBase.cmdMap.getUseageTemplate(true) ); pageLines.add( p.cmdBase.cmdBoom.getUseageTemplate(true) ); - pageLines.add(""); pageLines.add( p.cmdBase.cmdOwner.getUseageTemplate(true) ); pageLines.add( p.cmdBase.cmdOwnerList.getUseageTemplate(true) ); - pageLines.add(""); pageLines.add(p.txt.parse("Claimed land with ownership set is further protected so")); pageLines.add(p.txt.parse("that only the owner(s), faction admin, and possibly the")); pageLines.add(p.txt.parse("faction moderators have full access.")); diff --git a/src/com/massivecraft/factions/cmd/CmdLock.java b/src/com/massivecraft/factions/cmd/CmdLock.java index d811d0a6..16d4206e 100644 --- a/src/com/massivecraft/factions/cmd/CmdLock.java +++ b/src/com/massivecraft/factions/cmd/CmdLock.java @@ -17,7 +17,7 @@ public class CmdLock extends FCommand { this.aliases.add("lock"); //this.requiredArgs.add(""); - this.optionalArgs.put("on/off", "flipp"); + this.optionalArgs.put("on/off", "flip"); this.permission = Permission.LOCK.node; this.disableOnLock = false; diff --git a/src/com/massivecraft/factions/cmd/CmdOpen.java b/src/com/massivecraft/factions/cmd/CmdOpen.java index 9397aa37..4b0bbb02 100644 --- a/src/com/massivecraft/factions/cmd/CmdOpen.java +++ b/src/com/massivecraft/factions/cmd/CmdOpen.java @@ -13,7 +13,7 @@ public class CmdOpen extends FCommand this.aliases.add("open"); //this.requiredArgs.add(""); - this.optionalArgs.put("yes/no", "flipp"); + this.optionalArgs.put("yes/no", "flip"); this.permission = Permission.OPEN.node; this.disableOnLock = false; diff --git a/src/com/massivecraft/factions/cmd/CmdSafeunclaimall.java b/src/com/massivecraft/factions/cmd/CmdSafeunclaimall.java index 415ffeaa..16cc36e5 100644 --- a/src/com/massivecraft/factions/cmd/CmdSafeunclaimall.java +++ b/src/com/massivecraft/factions/cmd/CmdSafeunclaimall.java @@ -13,7 +13,7 @@ public class CmdSafeunclaimall extends FCommand this.aliases.add("safedeclaimall"); //this.requiredArgs.add(""); - this.optionalArgs.put("radius", "0"); + //this.optionalArgs.put("radius", "0"); this.permission = Permission.MANAGE_SAFE_ZONE.node; this.disableOnLock = true; diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java index 5e3e5eb8..18bf2e64 100644 --- a/src/com/massivecraft/factions/integration/Econ.java +++ b/src/com/massivecraft/factions/integration/Econ.java @@ -58,7 +58,7 @@ public class Econ } else { - P.p.log("Economy integration failed. The plugin \"Register\" is not installed."); + P.p.log("Economy integration is "+(Conf.econEnabled ? "enabled, but" : "disabled, and")+" the plugin \"Register\" is not installed."); } P.p.cmdBase.cmdHelp.updateHelp();