Recovery static method in Residence class...

Signed-off-by: 502647092 <jtb1@163.com>

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java

@@ -7,7 +7,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.CuboidArea;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
@@ -18,12 +18,12 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandArea extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandArea(final Residence plugin) {
+	public CommandArea(final ResidenceMain plugin) {
 		super("area");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(3);
 		setPossibleArguments("<list|listall|add|remove|replace> <领地名称> [区域名称]");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandBank extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandBank(final Residence plugin) {
+	public CommandBank(final ResidenceMain plugin) {
 		super("bank");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 		setPossibleArguments("[deposit(存入)|withdraw(取出)] 金额");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandCheck extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandCheck(final Residence plugin) {
+	public CommandCheck(final ResidenceMain plugin) {
 		super("check");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 		setPossibleArguments("<领地名称> <权限> [玩家]");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandClearFlags extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandClearFlags(final Residence plugin) {
+	public CommandClearFlags(final ResidenceMain plugin) {
 		super("clearflags");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(1);
 		setPossibleArguments("<领地名称>");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java

@@ -7,20 +7,20 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandCompass extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandCompass(final Residence plugin) {
+	public CommandCompass(final ResidenceMain plugin) {
 		super("compass", "cp");
 		this.plugin = plugin;
 		setDescription("切换指南针方向");
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setPossibleArguments("[领地名称]");
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandConfirm.java

@@ -8,16 +8,16 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandConfirm extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandConfirm(final Residence plugin) {
+	public CommandConfirm(final ResidenceMain plugin) {
 		super("confirm");
 		this.plugin = plugin;
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.selection.SelectionManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -15,12 +15,12 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandCreate extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandCreate(final Residence plugin) {
+	public CommandCreate(final ResidenceMain plugin) {
 		super("create", "new");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(1);
 		setPossibleArguments("<领地名称>");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCurrent.java

@@ -6,19 +6,19 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandCurrent extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandCurrent(final Residence plugin) {
+	public CommandCurrent(final ResidenceMain plugin) {
 		super("current");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java

@@ -5,19 +5,19 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandDefault extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandDefault(final Residence plugin) {
+	public CommandDefault(final ResidenceMain plugin) {
 		super("default");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(1);
 		setPossibleArguments("<领地名称>");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java

@@ -5,18 +5,18 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandGive extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandGive(final Residence plugin) {
+	public CommandGive(final ResidenceMain plugin) {
 		super("give");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 		setPossibleArguments("<目标玩家> <赠送的领地>");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandGset extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandGset(final Residence plugin) {
+	public CommandGset(final ResidenceMain plugin) {
 		super("gset");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(3);
 		setPossibleArguments("<领地名称(不写则为所在领地)> <组名称> <权限> <权限状态>");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandInfo.java

@@ -6,19 +6,19 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandInfo extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandInfo(final Residence plugin) {
+	public CommandInfo(final ResidenceMain plugin) {
 		super("info");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandKick.java

@@ -7,7 +7,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.permissions.PermissionGroup;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
@@ -16,13 +16,13 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandKick extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandKick(final Residence plugin) {
+	public CommandKick(final ResidenceMain plugin) {
 		super("kick");
 		this.plugin = plugin;
 		setMinimumArguments(1);
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setPossibleArguments("<目标玩家>");
 		setDescription("把玩家T出当前领地!");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.LeaseManager;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
@@ -15,12 +15,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandLease extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandLease(final Residence plugin) {
+	public CommandLease(final ResidenceMain plugin) {
 		super("lease");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 		setPossibleArguments("[renew/cost] [领地名]");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLimits.java

@@ -5,18 +5,18 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.permissions.PermissionManager;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandLimits extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandLimits(final Residence plugin) {
+	public CommandLimits(final ResidenceMain plugin) {
 		super("limits");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandList.java

@@ -5,18 +5,18 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandList extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandList(final Residence plugin) {
+	public CommandList(final ResidenceMain plugin) {
 		super("list");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAll.java

@@ -5,18 +5,18 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandListAll extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandListAll(final Residence plugin) {
+	public CommandListAll(final ResidenceMain plugin) {
 		super("listall");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAllHidden.java

@@ -6,19 +6,19 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandListAllHidden extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandListAllHidden(final Residence plugin) {
+	public CommandListAllHidden(final ResidenceMain plugin) {
 		super("listallhidden");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListHidden.java

@@ -6,19 +6,19 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandListHidden extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandListHidden(final Residence plugin) {
+	public CommandListHidden(final ResidenceMain plugin) {
 		super("listhidden");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLists.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.FlagPermissions;
 import com.bekvon.bukkit.residence.protection.PermissionListManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,13 +14,13 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandLists extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandLists(final Residence plugin) {
+	public CommandLists(final ResidenceMain plugin) {
 		super("lists");
 		this.plugin = plugin;
 		setMinimumArguments(1);
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setPossibleArguments("用法: /res lists ? 查看帮助");
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java

@@ -7,7 +7,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -15,12 +15,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandLset extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandLset(final Residence plugin) {
+	public CommandLset(final ResidenceMain plugin) {
 		super("lset");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 		setPossibleArguments("<领地名称> [blacklist(bl)/ignorelist(il)||info] [material]");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.economy.TransactionManager;
 import com.bekvon.bukkit.residence.economy.rent.RentManager;
 import com.bekvon.bukkit.residence.manager.ConfigManager;
@@ -21,13 +21,13 @@ public class CommandMarket extends BaseCommand {
 	ConfigManager cmanager;
 	PermissionManager gmanager;
 	Language language;
-	Residence plugin;
+	ResidenceMain plugin;
 	RentManager rentmanager;
 	ResidenceManager rmanager;
 	SelectionManager smanager;
 	TransactionManager tmanager;
 
-	public CommandMarket(final Residence plugin) {
+	public CommandMarket(final ResidenceMain plugin) {
 		super("market");
 		this.plugin = plugin;
 		rmanager = plugin.getResidenceManager();
@@ -37,7 +37,7 @@ public class CommandMarket extends BaseCommand {
 		rentmanager = plugin.getRentManager();
 		cmanager = plugin.getConfigManager();
 		tmanager = plugin.getTransactionManager();
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java

@@ -7,18 +7,18 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandMaterial extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandMaterial(final Residence plugin) {
+	public CommandMaterial(final ResidenceMain plugin) {
 		super("material");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(1);
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMessage.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -15,13 +15,13 @@ import cn.citycraft.PluginHelper.commands.BaseCommand;
 import cn.citycraft.PluginHelper.utils.StringUtil;
 
 public class CommandMessage extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandMessage(final Residence plugin) {
+	public CommandMessage(final ResidenceMain plugin) {
 		super("message");
 		this.plugin = plugin;
 		setMinimumArguments(1);
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setPossibleArguments("[enter|leave] [消息(移除则留空)]");
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java

@@ -5,18 +5,18 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandMirror extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandMirror(final Residence plugin) {
+	public CommandMirror(final ResidenceMain plugin) {
 		super("mirror");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandPset extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandPset(final Residence plugin) {
+	public CommandPset(final ResidenceMain plugin) {
 		super("pset");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 		setPossibleArguments("<residence> [player] [flag|removeall] [true/false/remove]");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemove.java

@@ -9,7 +9,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -17,9 +17,9 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandRemove extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandRemove(final Residence plugin) {
+	public CommandRemove(final ResidenceMain plugin) {
 		super("remove", "delete");
 		this.plugin = plugin;
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemoveAll.java

@@ -6,20 +6,20 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandRemoveAll extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandRemoveAll(final Residence plugin) {
+	public CommandRemoveAll(final ResidenceMain plugin) {
 		super("removeall");
 		this.plugin = plugin;
 		setMinimumArguments(1);
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java

@@ -5,18 +5,18 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandRename extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandRename(final Residence plugin) {
+	public CommandRename(final ResidenceMain plugin) {
 		super("rename");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandRenameArea extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandRenameArea(final Residence plugin) {
+	public CommandRenameArea(final ResidenceMain plugin) {
 		super("renamearea");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(3);
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java

@@ -10,7 +10,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.permissions.PermissionGroup;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.CuboidArea;
@@ -21,13 +21,13 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandSelect extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandSelect(final Residence plugin) {
+	public CommandSelect(final ResidenceMain plugin) {
 		super("select");
 		this.plugin = plugin;
 		setMinimumArguments(1);
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setPossibleArguments("请使用/res select ? 查看帮助");
 		setPermission("residence.select");
 	}
@@ -61,7 +61,7 @@ public class CommandSelect extends BaseCommand {
 						smanager.showSelectionInfo(player);
 						return;
 					} catch (final Exception ex) {
-						Logger.getLogger(Residence.class.getName()).log(Level.SEVERE, null, ex);
+						Logger.getLogger(ResidenceMain.class.getName()).log(Level.SEVERE, null, ex);
 						return;
 					}
 				} else if (smanager.worldEdit(player)) {
@@ -69,7 +69,7 @@ public class CommandSelect extends BaseCommand {
 						smanager.showSelectionInfo(player);
 						return;
 					} catch (final Exception ex) {
-						Logger.getLogger(Residence.class.getName()).log(Level.SEVERE, null, ex);
+						Logger.getLogger(ResidenceMain.class.getName()).log(Level.SEVERE, null, ex);
 						return;
 					}
 				}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandServer extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandServer(final Residence plugin) {
+	public CommandServer(final ResidenceMain plugin) {
 		super("server");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(1);
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandSet extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandSet(final Residence plugin) {
+	public CommandSet(final ResidenceMain plugin) {
 		super("set");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(2);
 		setPossibleArguments("<residence> [flag] [true/false/remove]");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSetOwner.java

@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -13,9 +13,9 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandSetOwner extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandSetOwner(final Residence plugin) {
+	public CommandSetOwner(final ResidenceMain plugin) {
 		super("setowner");
 		this.plugin = plugin;
 		setMinimumArguments(2);

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubList.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandSubList extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandSubList(final Residence plugin) {
+	public CommandSubList(final ResidenceMain plugin) {
 		super("sublist");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java

@@ -7,7 +7,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.selection.SelectionManager;
@@ -17,12 +17,12 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandSubZone extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandSubZone(final Residence plugin) {
+	public CommandSubZone(final ResidenceMain plugin) {
 		super("subzone", "sz");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(1);
 		setPossibleArguments("<领地名> [附属领地名]");
 	}

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java

@@ -7,19 +7,19 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.manager.ConfigManager;
 import com.bekvon.bukkit.residence.text.Language;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandTool extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandTool(final Residence plugin) {
+	public CommandTool(final ResidenceMain plugin) {
 		super("tool");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@SuppressWarnings("deprecation")

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandTp extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandTp(final Residence plugin) {
+	public CommandTp(final ResidenceMain plugin) {
 		super("tp");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 		setMinimumArguments(1);
 	}
 

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTpSet.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidenceManager;
 import com.bekvon.bukkit.residence.text.Language;
@@ -14,12 +14,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandTpSet extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandTpSet(final Residence plugin) {
+	public CommandTpSet(final ResidenceMain plugin) {
 		super("tpset");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandUnStuck.java

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 import com.bekvon.bukkit.residence.permissions.PermissionGroup;
 import com.bekvon.bukkit.residence.permissions.PermissionManager;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
@@ -16,12 +16,12 @@ import com.bekvon.bukkit.residence.text.Language;
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandUnStuck extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandUnStuck(final Residence plugin) {
+	public CommandUnStuck(final ResidenceMain plugin) {
 		super("unstuck");
 		this.plugin = plugin;
-		setOnlyPlayerExecutable(true);
+		setOnlyPlayerExecutable();
 	}
 
 	@Override

src/main/java/com/bekvon/bukkit/residence/commandsub/CommandVersion.java

@@ -7,14 +7,14 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 
-import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.ResidenceMain;
 
 import cn.citycraft.PluginHelper.commands.BaseCommand;
 
 public class CommandVersion extends BaseCommand {
-	Residence plugin;
+	ResidenceMain plugin;
 
-	public CommandVersion(Residence plugin) {
+	public CommandVersion(ResidenceMain plugin) {
 		super("version");
 		this.plugin = plugin;
 	}