From 55dd858be906612aa68bc0541f7fb8d8c7362f68 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Tue, 21 Jun 2011 00:38:31 -0500 Subject: [PATCH] A bit of cleanup and odds and ends, adding missing @Override annotations and such --- src/org/mcteam/factions/FPlayer.java | 3 +++ src/org/mcteam/factions/commands/FCommandAdmin.java | 1 + src/org/mcteam/factions/commands/FCommandChat.java | 1 + src/org/mcteam/factions/commands/FCommandClaim.java | 1 + src/org/mcteam/factions/commands/FCommandCreate.java | 1 + src/org/mcteam/factions/commands/FCommandDeinvite.java | 1 + src/org/mcteam/factions/commands/FCommandDescription.java | 1 + src/org/mcteam/factions/commands/FCommandDisband.java | 1 + src/org/mcteam/factions/commands/FCommandHelp.java | 6 ++++-- src/org/mcteam/factions/commands/FCommandHome.java | 1 + src/org/mcteam/factions/commands/FCommandInvite.java | 1 + src/org/mcteam/factions/commands/FCommandJoin.java | 1 + src/org/mcteam/factions/commands/FCommandKick.java | 1 + src/org/mcteam/factions/commands/FCommandLeave.java | 1 + src/org/mcteam/factions/commands/FCommandList.java | 1 + src/org/mcteam/factions/commands/FCommandLock.java | 1 + src/org/mcteam/factions/commands/FCommandMap.java | 1 + src/org/mcteam/factions/commands/FCommandMod.java | 1 + src/org/mcteam/factions/commands/FCommandOpen.java | 1 + src/org/mcteam/factions/commands/FCommandRelationAlly.java | 1 + src/org/mcteam/factions/commands/FCommandRelationEnemy.java | 1 + .../mcteam/factions/commands/FCommandRelationNeutral.java | 1 + src/org/mcteam/factions/commands/FCommandReload.java | 1 + src/org/mcteam/factions/commands/FCommandSafeclaim.java | 1 + src/org/mcteam/factions/commands/FCommandSaveAll.java | 1 + src/org/mcteam/factions/commands/FCommandSethome.java | 3 +-- src/org/mcteam/factions/commands/FCommandShow.java | 1 + src/org/mcteam/factions/commands/FCommandTag.java | 1 + src/org/mcteam/factions/commands/FCommandTitle.java | 1 + src/org/mcteam/factions/commands/FCommandUnclaim.java | 1 + src/org/mcteam/factions/commands/FCommandUnclaimall.java | 1 + src/org/mcteam/factions/commands/FCommandVersion.java | 2 +- 32 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/org/mcteam/factions/FPlayer.java b/src/org/mcteam/factions/FPlayer.java index a32a28be..091fdef4 100644 --- a/src/org/mcteam/factions/FPlayer.java +++ b/src/org/mcteam/factions/FPlayer.java @@ -60,6 +60,9 @@ public class FPlayer { this.lastPowerUpdateTime = System.currentTimeMillis(); this.lastLoginTime = System.currentTimeMillis(); this.mapAutoUpdating = false; + this.autoClaimEnabled = false; + this.autoSafeZoneEnabled = false; + this.autoWarZoneEnabled = false; } public void resetFactionData() { diff --git a/src/org/mcteam/factions/commands/FCommandAdmin.java b/src/org/mcteam/factions/commands/FCommandAdmin.java index f45f08c8..447575ae 100644 --- a/src/org/mcteam/factions/commands/FCommandAdmin.java +++ b/src/org/mcteam/factions/commands/FCommandAdmin.java @@ -15,6 +15,7 @@ public class FCommandAdmin extends FBaseCommand { helpDescription = "Hand over your admin rights"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandChat.java b/src/org/mcteam/factions/commands/FCommandChat.java index a4364ee0..9781090a 100644 --- a/src/org/mcteam/factions/commands/FCommandChat.java +++ b/src/org/mcteam/factions/commands/FCommandChat.java @@ -9,6 +9,7 @@ public class FCommandChat extends FBaseCommand { helpDescription = "Switch faction only chat on and off"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandClaim.java b/src/org/mcteam/factions/commands/FCommandClaim.java index 3c1c6efc..4ffb8781 100644 --- a/src/org/mcteam/factions/commands/FCommandClaim.java +++ b/src/org/mcteam/factions/commands/FCommandClaim.java @@ -8,6 +8,7 @@ public class FCommandClaim extends FBaseCommand { helpDescription = "Claim the land where you are standing"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandCreate.java b/src/org/mcteam/factions/commands/FCommandCreate.java index 3c7db979..ea4e54cb 100644 --- a/src/org/mcteam/factions/commands/FCommandCreate.java +++ b/src/org/mcteam/factions/commands/FCommandCreate.java @@ -25,6 +25,7 @@ public class FCommandCreate extends FBaseCommand { return Factions.hasPermCreate(sender); } + @Override public void perform() { if( isLocked() ) { diff --git a/src/org/mcteam/factions/commands/FCommandDeinvite.java b/src/org/mcteam/factions/commands/FCommandDeinvite.java index 178de7ca..a8642706 100644 --- a/src/org/mcteam/factions/commands/FCommandDeinvite.java +++ b/src/org/mcteam/factions/commands/FCommandDeinvite.java @@ -16,6 +16,7 @@ public class FCommandDeinvite extends FBaseCommand { helpDescription = "Remove a pending invitation"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandDescription.java b/src/org/mcteam/factions/commands/FCommandDescription.java index d97e75c9..ac1c6489 100644 --- a/src/org/mcteam/factions/commands/FCommandDescription.java +++ b/src/org/mcteam/factions/commands/FCommandDescription.java @@ -15,6 +15,7 @@ public class FCommandDescription extends FBaseCommand { helpDescription = "Change the faction description"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandDisband.java b/src/org/mcteam/factions/commands/FCommandDisband.java index 632a740e..562b7aaa 100644 --- a/src/org/mcteam/factions/commands/FCommandDisband.java +++ b/src/org/mcteam/factions/commands/FCommandDisband.java @@ -19,6 +19,7 @@ public class FCommandDisband extends FBaseCommand { return Factions.hasPermDisband(sender); } + @Override public void perform() { if( parameters.size() > 0) { Faction faction = Faction.findByTag(parameters.get(0)); diff --git a/src/org/mcteam/factions/commands/FCommandHelp.java b/src/org/mcteam/factions/commands/FCommandHelp.java index f74fe5d9..4c8c5b48 100644 --- a/src/org/mcteam/factions/commands/FCommandHelp.java +++ b/src/org/mcteam/factions/commands/FCommandHelp.java @@ -3,6 +3,7 @@ package org.mcteam.factions.commands; import java.util.ArrayList; import org.bukkit.command.CommandSender; +import org.mcteam.factions.Conf; import org.mcteam.factions.util.TextUtil; @@ -23,6 +24,7 @@ public class FCommandHelp extends FBaseCommand { return true; } + @Override public void perform() { int page = 1; if (parameters.size() > 0) { @@ -45,7 +47,7 @@ public class FCommandHelp extends FBaseCommand { // Build the help pages //----------------------------------------------// - public static ArrayList> helpPages; + public static final ArrayList> helpPages; static { helpPages = new ArrayList>(); @@ -132,7 +134,7 @@ public class FCommandHelp extends FBaseCommand { pageLines.add( new FCommandWarclaim().getUseageTemplate() ); pageLines.add( new FCommandAutoWarclaim().getUseageTemplate() ); pageLines.add( new FCommandWarunclaimall().getUseageTemplate() ); - pageLines.add("Note: /f unclaim works on safe/war zones as well."); + pageLines.add("Note: " + Conf.colorCommand + "f unclaim" + Conf.colorSystem + " works on safe/war zones as well."); helpPages.add(pageLines); pageLines = new ArrayList(); diff --git a/src/org/mcteam/factions/commands/FCommandHome.java b/src/org/mcteam/factions/commands/FCommandHome.java index 896a5e8f..de35b658 100644 --- a/src/org/mcteam/factions/commands/FCommandHome.java +++ b/src/org/mcteam/factions/commands/FCommandHome.java @@ -19,6 +19,7 @@ public class FCommandHome extends FBaseCommand { helpDescription = "Teleport to the faction home"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandInvite.java b/src/org/mcteam/factions/commands/FCommandInvite.java index 29192cbb..fe8ab908 100644 --- a/src/org/mcteam/factions/commands/FCommandInvite.java +++ b/src/org/mcteam/factions/commands/FCommandInvite.java @@ -16,6 +16,7 @@ public class FCommandInvite extends FBaseCommand { helpDescription = "Invite a player"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandJoin.java b/src/org/mcteam/factions/commands/FCommandJoin.java index b0ad3460..15fe2419 100644 --- a/src/org/mcteam/factions/commands/FCommandJoin.java +++ b/src/org/mcteam/factions/commands/FCommandJoin.java @@ -13,6 +13,7 @@ public class FCommandJoin extends FBaseCommand { helpDescription = "Join a faction"; } + @Override public void perform() { if( isLocked() ) { diff --git a/src/org/mcteam/factions/commands/FCommandKick.java b/src/org/mcteam/factions/commands/FCommandKick.java index c390d560..e5f28852 100644 --- a/src/org/mcteam/factions/commands/FCommandKick.java +++ b/src/org/mcteam/factions/commands/FCommandKick.java @@ -14,6 +14,7 @@ public class FCommandKick extends FBaseCommand { helpDescription = "Kick a player from the faction"; } + @Override public void perform() { if( isLocked() ) { diff --git a/src/org/mcteam/factions/commands/FCommandLeave.java b/src/org/mcteam/factions/commands/FCommandLeave.java index 0771bf9e..f55d6eea 100644 --- a/src/org/mcteam/factions/commands/FCommandLeave.java +++ b/src/org/mcteam/factions/commands/FCommandLeave.java @@ -15,6 +15,7 @@ public class FCommandLeave extends FBaseCommand { return true; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandList.java b/src/org/mcteam/factions/commands/FCommandList.java index f4eff044..07b12fdf 100644 --- a/src/org/mcteam/factions/commands/FCommandList.java +++ b/src/org/mcteam/factions/commands/FCommandList.java @@ -26,6 +26,7 @@ public class FCommandList extends FBaseCommand { return true; } + @Override public void perform() { ArrayList FactionList = new ArrayList(Faction.getAll()); FactionList.remove(Faction.getNone()); diff --git a/src/org/mcteam/factions/commands/FCommandLock.java b/src/org/mcteam/factions/commands/FCommandLock.java index 5274acae..518c772c 100644 --- a/src/org/mcteam/factions/commands/FCommandLock.java +++ b/src/org/mcteam/factions/commands/FCommandLock.java @@ -20,6 +20,7 @@ public class FCommandLock extends FBaseCommand { return Factions.hasPermLock(sender); } + @Override public void perform() { if( parameters.size() > 0 ) { setLock( parseBool( parameters.get(0) )); diff --git a/src/org/mcteam/factions/commands/FCommandMap.java b/src/org/mcteam/factions/commands/FCommandMap.java index 696c3abb..7ca5fa97 100644 --- a/src/org/mcteam/factions/commands/FCommandMap.java +++ b/src/org/mcteam/factions/commands/FCommandMap.java @@ -20,6 +20,7 @@ public class FCommandMap extends FBaseCommand { return true; } + @Override public void perform() { if (parameters.size() > 0) { String mapAutoUpdating = parameters.get(0); diff --git a/src/org/mcteam/factions/commands/FCommandMod.java b/src/org/mcteam/factions/commands/FCommandMod.java index dc356265..76200c4a 100644 --- a/src/org/mcteam/factions/commands/FCommandMod.java +++ b/src/org/mcteam/factions/commands/FCommandMod.java @@ -15,6 +15,7 @@ public class FCommandMod extends FBaseCommand { helpDescription = "Give or revoke moderator rights"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandOpen.java b/src/org/mcteam/factions/commands/FCommandOpen.java index f635683a..310d7616 100644 --- a/src/org/mcteam/factions/commands/FCommandOpen.java +++ b/src/org/mcteam/factions/commands/FCommandOpen.java @@ -13,6 +13,7 @@ public class FCommandOpen extends FBaseCommand { helpDescription = "Switch if invitation is required to join"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandRelationAlly.java b/src/org/mcteam/factions/commands/FCommandRelationAlly.java index 3958046e..08e6a264 100644 --- a/src/org/mcteam/factions/commands/FCommandRelationAlly.java +++ b/src/org/mcteam/factions/commands/FCommandRelationAlly.java @@ -8,6 +8,7 @@ public class FCommandRelationAlly extends FRelationCommand { aliases.add("ally"); } + @Override public void perform() { if( isLocked() ) { diff --git a/src/org/mcteam/factions/commands/FCommandRelationEnemy.java b/src/org/mcteam/factions/commands/FCommandRelationEnemy.java index 1244df98..38f18b90 100644 --- a/src/org/mcteam/factions/commands/FCommandRelationEnemy.java +++ b/src/org/mcteam/factions/commands/FCommandRelationEnemy.java @@ -8,6 +8,7 @@ public class FCommandRelationEnemy extends FRelationCommand { aliases.add("enemy"); } + @Override public void perform() { if( isLocked() ) { diff --git a/src/org/mcteam/factions/commands/FCommandRelationNeutral.java b/src/org/mcteam/factions/commands/FCommandRelationNeutral.java index 9978416e..f5438023 100644 --- a/src/org/mcteam/factions/commands/FCommandRelationNeutral.java +++ b/src/org/mcteam/factions/commands/FCommandRelationNeutral.java @@ -8,6 +8,7 @@ public class FCommandRelationNeutral extends FRelationCommand { aliases.add("neutral"); } + @Override public void perform() { if( isLocked() ) { diff --git a/src/org/mcteam/factions/commands/FCommandReload.java b/src/org/mcteam/factions/commands/FCommandReload.java index 2999458f..5111c9d5 100644 --- a/src/org/mcteam/factions/commands/FCommandReload.java +++ b/src/org/mcteam/factions/commands/FCommandReload.java @@ -24,6 +24,7 @@ public class FCommandReload extends FBaseCommand { return Factions.hasPermReload(sender); } + @Override public void perform() { Factions.log("=== RELOAD START ==="); long timeInitStart = System.currentTimeMillis(); diff --git a/src/org/mcteam/factions/commands/FCommandSafeclaim.java b/src/org/mcteam/factions/commands/FCommandSafeclaim.java index bb31eeb1..15ef3dc7 100644 --- a/src/org/mcteam/factions/commands/FCommandSafeclaim.java +++ b/src/org/mcteam/factions/commands/FCommandSafeclaim.java @@ -22,6 +22,7 @@ public class FCommandSafeclaim extends FBaseCommand { return Factions.hasPermManageSafeZone(sender); } + @Override public void perform() { if( isLocked() ) { diff --git a/src/org/mcteam/factions/commands/FCommandSaveAll.java b/src/org/mcteam/factions/commands/FCommandSaveAll.java index e9685e10..7c7db378 100644 --- a/src/org/mcteam/factions/commands/FCommandSaveAll.java +++ b/src/org/mcteam/factions/commands/FCommandSaveAll.java @@ -19,6 +19,7 @@ public class FCommandSaveAll extends FBaseCommand { return Factions.hasPermSaveAll(sender); } + @Override public void perform() { Factions.saveAll(); diff --git a/src/org/mcteam/factions/commands/FCommandSethome.java b/src/org/mcteam/factions/commands/FCommandSethome.java index 3bb2f2dd..989bea32 100644 --- a/src/org/mcteam/factions/commands/FCommandSethome.java +++ b/src/org/mcteam/factions/commands/FCommandSethome.java @@ -1,9 +1,7 @@ package org.mcteam.factions.commands; -import org.mcteam.factions.Board; import org.mcteam.factions.Conf; import org.mcteam.factions.Faction; -import org.mcteam.factions.FLocation; import org.mcteam.factions.struct.Role; public class FCommandSethome extends FBaseCommand { @@ -14,6 +12,7 @@ public class FCommandSethome extends FBaseCommand { helpDescription = "Set the faction home"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandShow.java b/src/org/mcteam/factions/commands/FCommandShow.java index 2d1ffde5..e9a8f2d7 100644 --- a/src/org/mcteam/factions/commands/FCommandShow.java +++ b/src/org/mcteam/factions/commands/FCommandShow.java @@ -27,6 +27,7 @@ public class FCommandShow extends FBaseCommand { return true; } + @Override public void perform() { Faction faction; if (parameters.size() > 0) { diff --git a/src/org/mcteam/factions/commands/FCommandTag.java b/src/org/mcteam/factions/commands/FCommandTag.java index 2c1b69df..759ffa1d 100644 --- a/src/org/mcteam/factions/commands/FCommandTag.java +++ b/src/org/mcteam/factions/commands/FCommandTag.java @@ -18,6 +18,7 @@ public class FCommandTag extends FBaseCommand { helpDescription = "Change the faction tag"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandTitle.java b/src/org/mcteam/factions/commands/FCommandTitle.java index c5ad7c9d..c8107521 100644 --- a/src/org/mcteam/factions/commands/FCommandTitle.java +++ b/src/org/mcteam/factions/commands/FCommandTitle.java @@ -17,6 +17,7 @@ public class FCommandTitle extends FBaseCommand { helpDescription = "Set or remove a players title"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandUnclaim.java b/src/org/mcteam/factions/commands/FCommandUnclaim.java index 183b6eff..4399687c 100644 --- a/src/org/mcteam/factions/commands/FCommandUnclaim.java +++ b/src/org/mcteam/factions/commands/FCommandUnclaim.java @@ -16,6 +16,7 @@ public class FCommandUnclaim extends FBaseCommand { helpDescription = "Unclaim the land where you are standing"; } + @Override public void perform() { if( isLocked() ) { diff --git a/src/org/mcteam/factions/commands/FCommandUnclaimall.java b/src/org/mcteam/factions/commands/FCommandUnclaimall.java index fa4f3e75..3dec6bc3 100644 --- a/src/org/mcteam/factions/commands/FCommandUnclaimall.java +++ b/src/org/mcteam/factions/commands/FCommandUnclaimall.java @@ -14,6 +14,7 @@ public class FCommandUnclaimall extends FBaseCommand { helpDescription = "Unclaim all of your factions land"; } + @Override public void perform() { if ( ! assertHasFaction()) { return; diff --git a/src/org/mcteam/factions/commands/FCommandVersion.java b/src/org/mcteam/factions/commands/FCommandVersion.java index d431ea04..599a65e5 100644 --- a/src/org/mcteam/factions/commands/FCommandVersion.java +++ b/src/org/mcteam/factions/commands/FCommandVersion.java @@ -19,7 +19,7 @@ public class FCommandVersion extends FBaseCommand { return true; } - + @Override public void perform() { sendMessage("You are running "+Factions.instance.getDescription().getFullName()); }