1
0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-25 21:56:06 +00:00

还原Protection包路径 兼容部分老插件...

Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-10-31 13:25:06 +08:00
parent d01ba6c744
commit 0110c01726
84 changed files with 188 additions and 139 deletions

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cn.citycraft</groupId>
<artifactId>Residence</artifactId>
<version>2.8.0.8</version>
<version>2.8.1.0</version>
<name>Residence</name>
<description>重制版本的领地插件 - 喵♂呜</description>
<build>
@@ -55,7 +55,7 @@
</build>
<properties>
<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
<update.description>&amp;c修改包名称 &amp;a保留原有API接口...</update.description>
<update.description>&amp;e还原protection包路径 &amp;a兼容部分老插件...</update.description>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>

View File

@@ -34,6 +34,12 @@ import org.bukkit.plugin.java.JavaPlugin;
import com.bekvon.bukkit.residence.Residence;
import com.bekvon.bukkit.residence.event.ResidenceCommandEvent;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import com.bekvon.bukkit.residence.protection.LeaseManager;
import com.bekvon.bukkit.residence.protection.PermissionListManager;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import com.bekvon.bukkit.residence.protection.WorldFlagManager;
import com.earth2me.essentials.Essentials;
import cn.citycraft.PluginHelper.commands.HandlerMainCommand;
@@ -60,12 +66,6 @@ import cn.citycraft.Residence.manager.EntityManager;
import cn.citycraft.Residence.manager.FlagManager;
import cn.citycraft.Residence.permissions.PermissionManager;
import cn.citycraft.Residence.persistance.YMLSaveHelper;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
import cn.citycraft.Residence.protection.LeaseManager;
import cn.citycraft.Residence.protection.PermissionListManager;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.protection.WorldFlagManager;
import cn.citycraft.Residence.runnable.AutoSaveTask;
import cn.citycraft.Residence.runnable.HealTask;
import cn.citycraft.Residence.runnable.LeaseTask;

View File

@@ -7,13 +7,13 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.CuboidArea;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.CuboidArea;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.selection.SelectionManager;
import cn.citycraft.Residence.text.Language;

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandBank extends BaseCommand {

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandCheck extends BaseCommand {

View File

@@ -5,9 +5,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.FlagPermissions;
public class CommandCheckSelf extends BaseCommand {
ResidenceMain plugin;

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandClearFlags extends BaseCommand {

View File

@@ -7,9 +7,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandCompass extends BaseCommand {

View File

@@ -8,9 +8,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandConfirm extends BaseCommand {

View File

@@ -6,11 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.selection.SelectionManager;
import cn.citycraft.Residence.text.Language;

View File

@@ -6,9 +6,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandCurrent extends BaseCommand {

View File

@@ -5,10 +5,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
public class CommandDefault extends BaseCommand {
ResidenceMain plugin;

View File

@@ -5,9 +5,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
public class CommandGive extends BaseCommand {
ResidenceMain plugin;

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandGset extends BaseCommand {

View File

@@ -6,9 +6,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandInfo extends BaseCommand {

View File

@@ -7,11 +7,12 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandKick extends BaseCommand {

View File

@@ -6,11 +6,12 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.LeaseManager;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.LeaseManager;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandLease extends BaseCommand {

View File

@@ -5,9 +5,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
public class CommandList extends BaseCommand {
ResidenceMain plugin;

View File

@@ -5,9 +5,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
public class CommandListAll extends BaseCommand {
ResidenceMain plugin;

View File

@@ -6,9 +6,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandListAllHidden extends BaseCommand {

View File

@@ -6,9 +6,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandListHidden extends BaseCommand {

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import com.bekvon.bukkit.residence.protection.PermissionListManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.FlagPermissions;
import cn.citycraft.Residence.protection.PermissionListManager;
import cn.citycraft.Residence.text.Language;
public class CommandLists extends BaseCommand {

View File

@@ -7,10 +7,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandLset extends BaseCommand {

View File

@@ -6,13 +6,14 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.economy.TransactionManager;
import cn.citycraft.Residence.economy.rent.RentManager;
import cn.citycraft.Residence.manager.ConfigManager;
import cn.citycraft.Residence.permissions.PermissionManager;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.selection.SelectionManager;
import cn.citycraft.Residence.text.Language;

View File

@@ -6,11 +6,12 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.PluginHelper.utils.StringUtil;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandMessage extends BaseCommand {

View File

@@ -5,9 +5,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
public class CommandMirror extends BaseCommand {
ResidenceMain plugin;

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandPset extends BaseCommand {

View File

@@ -9,10 +9,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandRemove extends BaseCommand {

View File

@@ -6,9 +6,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandRemoveAll extends BaseCommand {

View File

@@ -5,9 +5,10 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ResidenceManager;
public class CommandRename extends BaseCommand {
ResidenceMain plugin;

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandRenameArea extends BaseCommand {

View File

@@ -10,12 +10,13 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.CuboidArea;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.CuboidArea;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.selection.SelectionManager;
import cn.citycraft.Residence.text.Language;

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandServer extends BaseCommand {

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandSet extends BaseCommand {

View File

@@ -5,10 +5,11 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandSetOwner extends BaseCommand {

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandSubList extends BaseCommand {

View File

@@ -7,12 +7,12 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.selection.SelectionManager;
import cn.citycraft.Residence.text.Language;

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandTp extends BaseCommand {

View File

@@ -6,10 +6,11 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandTpSet extends BaseCommand {

View File

@@ -6,12 +6,13 @@ import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.PluginHelper.commands.BaseCommand;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.permissions.PermissionManager;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.text.Language;
public class CommandUnStuck extends BaseCommand {

View File

@@ -8,8 +8,9 @@ package cn.citycraft.Residence.economy;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
/**
*

View File

@@ -15,12 +15,13 @@ import java.util.Set;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.CuboidArea;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.permissions.PermissionManager;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.CuboidArea;
import cn.citycraft.Residence.protection.ResidenceManager;
/**
*

View File

@@ -18,11 +18,11 @@ import org.bukkit.plugin.PluginManager;
import com.bekvon.bukkit.residence.event.ResidenceRentEvent;
import com.bekvon.bukkit.residence.event.ResidenceRentEvent.RentEventType;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions.FlagState;
/**
*

View File

@@ -11,9 +11,10 @@ import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.protection.ClaimedResidence;
/**
*

View File

@@ -19,9 +19,10 @@ import org.bukkit.event.block.BlockFromToEvent;
import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
import org.bukkit.event.block.BlockPistonExtendEvent;
import org.bukkit.event.block.BlockPistonRetractEvent;

View File

@@ -37,10 +37,11 @@ import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.hanging.HangingBreakEvent;
import org.bukkit.event.hanging.HangingPlaceEvent;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.manager.EntityManager;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
/**
*

View File

@@ -38,14 +38,14 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;
import com.bekvon.bukkit.residence.event.ResidenceChangedEvent;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import cn.citycraft.PluginHelper.utils.ActionBar;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.chat.ChatChannel;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
/**
*

View File

@@ -14,8 +14,9 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerInteractAtEntityEvent;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.FlagPermissions;
/**
*

View File

@@ -12,9 +12,10 @@ import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
public class ResidenceBugFix implements Listener {
ResidenceMain plugin;

View File

@@ -9,10 +9,11 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.manager.EntityManager;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
public class ResidenceAnimalKillingListener implements Listener {
EntityManager entitymanager;

View File

@@ -13,11 +13,11 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import com.bekvon.bukkit.residence.event.ResidenceChangedEvent;
import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent;
import com.bekvon.bukkit.residence.event.ResidenceFlagChangeEvent;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import com.bekvon.bukkit.residence.protection.ResidencePermissions;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
import cn.citycraft.Residence.protection.ResidencePermissions;
public class ResidenceFlyListener implements Listener {

View File

@@ -9,10 +9,11 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.manager.EntityManager;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
public class ResidenceInteractListener implements Listener {
EntityManager entitymanager;

View File

@@ -13,9 +13,10 @@ import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.PluginHelper.config.FileConfig;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.FlagPermissions;
/**
*

View File

@@ -15,10 +15,11 @@ import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.CuboidArea;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.CuboidArea;
import cn.citycraft.Residence.protection.FlagPermissions;
import cn.citycraft.Residence.protection.FlagPermissions.FlagState;
/**
*

View File

@@ -16,8 +16,9 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.FlagPermissions;
import cn.citycraft.Residence.vaultinterface.ResidenceVaultAdapter;
/**

View File

@@ -4,8 +4,9 @@ import org.bukkit.Bukkit;
import org.bukkit.entity.Damageable;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.protection.ClaimedResidence;
public class HealTask implements Runnable {
ResidenceMain plugin;

View File

@@ -16,9 +16,10 @@ import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.CuboidArea;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.protection.CuboidArea;
/**
*

View File

@@ -6,12 +6,11 @@ package cn.citycraft.Residence.selection;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import com.sk89q.worldedit.bukkit.selections.CuboidSelection;
import com.sk89q.worldedit.bukkit.selections.Selection;
import cn.citycraft.Residence.protection.ClaimedResidence;
/**
* @author Administrator
*

View File

@@ -6,6 +6,13 @@ import java.util.Map;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions;
import com.bekvon.bukkit.residence.protection.LeaseManager;
import com.bekvon.bukkit.residence.protection.PermissionListManager;
import com.bekvon.bukkit.residence.protection.ResidenceManager;
import com.bekvon.bukkit.residence.protection.WorldFlagManager;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.chat.ChatManager;
import cn.citycraft.Residence.economy.EconomyInterface;
@@ -15,12 +22,6 @@ import cn.citycraft.Residence.itemlist.WorldItemManager;
import cn.citycraft.Residence.manager.ConfigManager;
import cn.citycraft.Residence.manager.EntityManager;
import cn.citycraft.Residence.permissions.PermissionManager;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions;
import cn.citycraft.Residence.protection.LeaseManager;
import cn.citycraft.Residence.protection.PermissionListManager;
import cn.citycraft.Residence.protection.ResidenceManager;
import cn.citycraft.Residence.protection.WorldFlagManager;
import cn.citycraft.Residence.selection.SelectionManager;
import cn.citycraft.Residence.text.Language;
import cn.citycraft.Residence.text.help.HelpEntry;

View File

@@ -7,7 +7,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.event.Cancellable;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -3,7 +3,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
* The {@link ResidenceChangedEvent} is fired when a player transitions between residences and/or

View File

@@ -8,7 +8,7 @@ import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -8,8 +8,8 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.CuboidArea;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.CuboidArea;
/**
*

View File

@@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -8,8 +8,8 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions.FlagState;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState;
/**
*

View File

@@ -7,7 +7,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -7,8 +7,8 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import cn.citycraft.Residence.protection.FlagPermissions.FlagState;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState;
/**
*

View File

@@ -6,7 +6,7 @@
package com.bekvon.bukkit.residence.event;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -7,7 +7,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -7,7 +7,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -1,6 +1,6 @@
package com.bekvon.bukkit.residence.event;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
public class ResidenceRenameEvent extends ResidenceEvent {
protected String NewResName;

View File

@@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -9,7 +9,7 @@ import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import cn.citycraft.Residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
/**
*

View File

@@ -1,7 +1,7 @@
/*
* To change this template, choose Tools | Templates and open the template in the editor.
*/
package cn.citycraft.Residence.protection;
package com.bekvon.bukkit.residence.protection;
import java.util.ArrayList;
import java.util.Collection;

View File

@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
package cn.citycraft.Residence.protection;
package com.bekvon.bukkit.residence.protection;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -18,7 +18,7 @@ import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import cn.citycraft.Residence.protection.ResidenceManager.ChunkRef;
import com.bekvon.bukkit.residence.protection.ResidenceManager.ChunkRef;
/**
*

View File

@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package cn.citycraft.Residence.protection;
package com.bekvon.bukkit.residence.protection;
import java.util.ArrayList;
import java.util.Collections;

View File

@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
package cn.citycraft.Residence.protection;
package com.bekvon.bukkit.residence.protection;
import java.util.Collections;
import java.util.Date;

View File

@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
package cn.citycraft.Residence.protection;
package com.bekvon.bukkit.residence.protection;
import java.util.Collections;
import java.util.HashMap;

View File

@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates and open the template in the editor.
*/
package cn.citycraft.Residence.protection;
package com.bekvon.bukkit.residence.protection;
import java.util.ArrayList;
import java.util.Collection;

View File

@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates and open the template in the editor.
*/
package cn.citycraft.Residence.protection;
package com.bekvon.bukkit.residence.protection;
import java.util.ArrayList;
import java.util.Collections;

View File

@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates and open the template in the editor.
*/
package cn.citycraft.Residence.protection;
package com.bekvon.bukkit.residence.protection;
import java.util.HashMap;
import java.util.Map;