重构代码 尝试兼容172...

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

src/main/java/cn/citycraft/Residence/ResidenceMain.java

@@ -44,6 +44,7 @@ import com.earth2me.essentials.Essentials;
 
 import cn.citycraft.PluginHelper.commands.HandlerMainCommand;
 import cn.citycraft.PluginHelper.config.FileConfig;
+import cn.citycraft.PluginHelper.utils.CompatibleUtil;
 import cn.citycraft.PluginHelper.utils.VersionChecker;
 import cn.citycraft.Residence.chat.ChatManager;
 import cn.citycraft.Residence.commandmain.CommandRc;
@@ -513,7 +514,7 @@ public class ResidenceMain extends JavaPlugin {
                 rentint = rentint < 1 ? 1 : rentint * 60 * 20;
                 taskmanager.add(this.getServer().getScheduler().runTaskTimerAsynchronously(this, new RentTask(this), rentint, rentint));
             }
-			for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
+            for (final Player player : CompatibleUtil.getOnlinePlayers()) {
                 if (this.getPermissionManager().isResidenceAdmin(player)) {
                     turnResAdminOn(player);
                 }

src/main/java/cn/citycraft/Residence/economy/EconomyInterface.java

@@ -2,9 +2,14 @@ package cn.citycraft.Residence.economy;
 
 public interface EconomyInterface {
     public double getBalance(String playerName);
+
     public boolean canAfford(String playerName, double amount);
+
     public boolean add(String playerName, double amount);
+
     public boolean subtract(String playerName, double amount);
+
     public boolean transfer(String playerFrom, String playerTo, double amount);
+
     public String getName();
 }

src/main/java/cn/citycraft/Residence/economy/rent/RentedLand.java

@@ -27,8 +27,8 @@ public class RentedLand {
         rentables.put("AutoRefresh", autoRefresh);
         return rentables;
     }
-    public static RentedLand load(Map<String,Object> map)
-    {
+
+    public static RentedLand load(Map<String, Object> map) {
         RentedLand newland = new RentedLand();
         newland.player = (String) map.get("Player");
         newland.startTime = (Long) map.get("StartTime");

src/main/java/cn/citycraft/Residence/itemlist/WorldItemList.java

@@ -17,23 +17,19 @@ public class WorldItemList extends ItemList {
     protected String world;
     protected String group;
 
-    public WorldItemList(ListType listType)
-    {
+    public WorldItemList(ListType listType) {
         super(listType);
     }
 
-    protected WorldItemList()
-    {
+    protected WorldItemList() {
 
     }
 
-    public String getWorld()
-    {
+    public String getWorld() {
         return world;
     }
 
-    public String getGroup()
-    {
+    public String getGroup() {
         return group;
     }
 
@@ -43,22 +39,19 @@ public class WorldItemList extends ItemList {
         return super.isAllowed(mat);
     }
 
-    public boolean isIgnored(Material mat, String inworld, String ingroup)
-    {
+    public boolean isIgnored(Material mat, String inworld, String ingroup) {
         if (!listApplicable(inworld, ingroup))
             return false;
         return super.isIgnored(mat);
     }
 
-    public boolean isListed(Material mat, String inworld, String ingroup)
-    {
+    public boolean isListed(Material mat, String inworld, String ingroup) {
         if (!listApplicable(inworld, ingroup))
             return false;
         return super.isListed(mat);
     }
 
-    public boolean listApplicable(String inworld, String ingroup)
-    {
+    public boolean listApplicable(String inworld, String ingroup) {
         if (world != null) {
             if (!world.equalsIgnoreCase(inworld)) {
                 return false;
@@ -72,8 +65,7 @@ public class WorldItemList extends ItemList {
         return true;
     }
 
-    public static WorldItemList readList(ConfigurationSection node)
-    {
+    public static WorldItemList readList(ConfigurationSection node) {
         WorldItemList list = new WorldItemList();
         ItemList.readList(node, list);
         list.world = node.getString("World", null);

src/main/java/cn/citycraft/Residence/itemlist/WorldItemManager.java

@@ -18,8 +18,7 @@ import org.bukkit.configuration.file.FileConfiguration;
 public class WorldItemManager {
     protected List<WorldItemList> lists;
 
-    public WorldItemManager(FileConfiguration config)
-    {
+    public WorldItemManager(FileConfiguration config) {
         lists = new ArrayList<WorldItemList>();
         this.readLists(config);
     }
@@ -33,8 +32,7 @@ public class WorldItemManager {
         return true;
     }
 
-    public boolean isIgnored(Material mat, String group, String world)
-    {
+    public boolean isIgnored(Material mat, String group, String world) {
         for (WorldItemList list : lists) {
             if (list.isIgnored(mat, world, group)) {
                 return true;

src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java

@@ -41,6 +41,7 @@ import com.bekvon.bukkit.residence.protection.FlagPermissions;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 
 import cn.citycraft.PluginHelper.utils.ActionBar;
+import cn.citycraft.PluginHelper.utils.CompatibleUtil;
 import cn.citycraft.Residence.ResidenceMain;
 import cn.citycraft.Residence.chat.ChatChannel;
 import cn.citycraft.Residence.permissions.PermissionGroup;
@@ -68,7 +69,7 @@ public class ResidencePlayerListener implements Listener {
         playerToggleChat = new ArrayList<>();
         minUpdateTime = plugin.getConfigManager().getMinMoveUpdateInterval();
         chatenabled = plugin.getConfigManager().chatEnabled();
-		for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
+        for (final Player player : CompatibleUtil.getOnlinePlayers()) {
             lastUpdate.put(player.getName(), System.currentTimeMillis());
         }
     }

src/main/java/cn/citycraft/Residence/permissions/PermissionsInterface.java

@@ -13,5 +13,6 @@ import org.bukkit.entity.Player;
  */
 public interface PermissionsInterface {
     public String getPlayerGroup(Player player);
+
     public String getPlayerGroup(String player, String world);
 }

src/main/java/cn/citycraft/Residence/persistance/YMLSaveHelper.java

@@ -28,8 +28,7 @@ public class YMLSaveHelper {
     Yaml yml;
     Map<String, Object> root;
 
-    public YMLSaveHelper(File ymlfile) throws IOException
-    {
+    public YMLSaveHelper(File ymlfile) throws IOException {
         DumperOptions options = new DumperOptions();
         options.setDefaultFlowStyle(FlowStyle.BLOCK);
         yml = new Yaml(options);
@@ -40,8 +39,7 @@ public class YMLSaveHelper {
         f = ymlfile;
     }
 
-    public void save() throws IOException
-    {
+    public void save() throws IOException {
         if (f.isFile())
             f.delete();
         FileOutputStream fout = new FileOutputStream(f);
@@ -51,16 +49,14 @@ public class YMLSaveHelper {
     }
 
     @SuppressWarnings("unchecked")
-	public void load() throws IOException
-    {
+    public void load() throws IOException {
         FileInputStream fis = new FileInputStream(f);
         InputStreamReader isr = new InputStreamReader(fis, "UTF8");
         root = (Map<String, Object>) yml.load(isr);
         isr.close();
     }
 
-    public Map<String,Object> getRoot()
-    {
+    public Map<String, Object> getRoot() {
         return root;
     }
 

src/main/java/cn/citycraft/Residence/runnable/HealTask.java

@@ -1,11 +1,11 @@
 package cn.citycraft.Residence.runnable;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Damageable;
 import org.bukkit.entity.Player;
 
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 
+import cn.citycraft.PluginHelper.utils.CompatibleUtil;
 import cn.citycraft.Residence.ResidenceMain;
 
 public class HealTask implements Runnable {
@@ -18,7 +18,7 @@ public class HealTask implements Runnable {
     @Override
     public void run() {
         try {
-			for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
+            for (final Player player : CompatibleUtil.getOnlinePlayers()) {
                 final String resname = plugin.getPlayerListener().getCurrentResidenceName(player.getName());
                 ClaimedResidence res = null;
                 if (resname != null) {

src/main/java/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java

@@ -17,8 +17,7 @@ public class CancellableResidenceEvent extends ResidenceEvent implements Cancell
 
     protected boolean cancelled;
 
-	public CancellableResidenceEvent(String eventName, ClaimedResidence resref)
-	{
+    public CancellableResidenceEvent(String eventName, ClaimedResidence resref) {
         super(eventName, resref);
     }
 

src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java

@@ -18,8 +18,7 @@ public class CancellableResidencePlayerEvent extends ResidencePlayerEvent implem
 
     protected boolean cancelled;
 
-	public CancellableResidencePlayerEvent(String eventName, ClaimedResidence resref, Player player)
-	{
+    public CancellableResidencePlayerEvent(String eventName, ClaimedResidence resref, Player player) {
         super(eventName, resref, player);
         cancelled = false;
     }

src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java

@@ -18,8 +18,7 @@ public class CancellableResidencePlayerFlagEvent extends ResidencePlayerFlagEven
 
     protected boolean cancelled;
 
-	public CancellableResidencePlayerFlagEvent(String eventName, ClaimedResidence resref, Player player, String flag, FlagType type, String target)
-	{
+    public CancellableResidencePlayerFlagEvent(String eventName, ClaimedResidence resref, Player player, String flag, FlagType type, String target) {
         super(eventName, resref, player, flag, type, target);
     }
 

src/main/java/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java

@@ -37,11 +37,14 @@ public class ResidenceChangedEvent extends ResidencePlayerEvent {
      * Constructs a {@link ResidenceChangedEvent} to identify a residence transition for the
      * given player
      * 
-     * @param from the residence that the player left or {@code null} if coming from an
+     * @param from
+     *            the residence that the player left or {@code null} if coming from an
      *            unprotected area.
-     * @param to the residence that the player entered or {@code null} if entering an
+     * @param to
+     *            the residence that the player entered or {@code null} if entering an
      *            unprotected area.
-     * @param player player involved in the transition
+     * @param player
+     *            player involved in the transition
      */
     public ResidenceChangedEvent(ClaimedResidence from, ClaimedResidence to, Player player) {
         super("RESIDENCE_CHANGE", null, player);

src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java

@@ -17,6 +17,7 @@ import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 public class ResidenceChatEvent extends CancellableResidencePlayerEvent {
 
     private static final HandlerList handlers = new HandlerList();
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
@@ -35,23 +36,19 @@ public class ResidenceChatEvent extends CancellableResidencePlayerEvent {
         this.color = color;
     }
 
-    public String getChatMessage()
-    {
+    public String getChatMessage() {
         return message;
     }
 
-    public void setChatMessage(String newmessage)
-    {
+    public void setChatMessage(String newmessage) {
         message = newmessage;
     }
 
-    public ChatColor getColor()
-    {
+    public ChatColor getColor() {
         return color;
     }
 
-    public void setColor(ChatColor c)
-    {
+    public void setColor(ChatColor c) {
         color = c;
     }
 }

src/main/java/com/bekvon/bukkit/residence/event/ResidenceCommandEvent.java

@@ -17,6 +17,7 @@ import org.bukkit.event.HandlerList;
 public class ResidenceCommandEvent extends Event implements Cancellable {
 
     private static final HandlerList handlers = new HandlerList();
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
@@ -26,8 +27,8 @@ public class ResidenceCommandEvent extends Event implements Cancellable {
     protected String cmd;
     protected String arglist[];
     CommandSender commandsender;
-	public ResidenceCommandEvent(String command, String args[], CommandSender sender)
-	{
+
+    public ResidenceCommandEvent(String command, String args[], CommandSender sender) {
         super();
         cancelled = false;
         arglist = args;
@@ -35,13 +36,11 @@ public class ResidenceCommandEvent extends Event implements Cancellable {
         commandsender = sender;
     }
 
-	public String[] getArgs()
-	{
+    public String[] getArgs() {
         return arglist;
     }
 
-	public String getCommand()
-	{
+    public String getCommand() {
         return cmd;
     }
 
@@ -50,8 +49,7 @@ public class ResidenceCommandEvent extends Event implements Cancellable {
         return handlers;
     }
 
-	public CommandSender getSender()
-	{
+    public CommandSender getSender() {
         return commandsender;
     }
 

src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java

@@ -18,6 +18,7 @@ import com.bekvon.bukkit.residence.protection.CuboidArea;
 public class ResidenceCreationEvent extends CancellableResidencePlayerEvent {
 
     private static final HandlerList handlers = new HandlerList();
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
@@ -30,30 +31,25 @@ public class ResidenceCreationEvent extends CancellableResidencePlayerEvent {
     protected String resname;
     CuboidArea area;
 
-    public ResidenceCreationEvent(Player player, String newname, ClaimedResidence resref, CuboidArea resarea)
-    {
+    public ResidenceCreationEvent(Player player, String newname, ClaimedResidence resref, CuboidArea resarea) {
         super("RESIDENCE_CREATE", resref, player);
         resname = newname;
         area = resarea;
     }
 
-    public String getResidenceName()
-    {
+    public String getResidenceName() {
         return resname;
     }
 
-    public void setResidenceName(String name)
-    {
+    public void setResidenceName(String name) {
         resname = name;
     }
 
-    public CuboidArea getPhysicalArea()
-    {
+    public CuboidArea getPhysicalArea() {
         return area;
     }
 
-    public void setPhysicalArea(CuboidArea newarea)
-    {
+    public void setPhysicalArea(CuboidArea newarea) {
         area = newarea;
     }
 }

src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java

@@ -28,19 +28,19 @@ public class ResidenceDeleteEvent extends CancellableResidencePlayerEvent {
     }
 
     public enum DeleteCause {
-        LEASE_EXPIRE,PLAYER_DELETE,OTHER
+        LEASE_EXPIRE,
+        PLAYER_DELETE,
+        OTHER
     }
 
     DeleteCause cause;
 
-    public ResidenceDeleteEvent(Player player, ClaimedResidence resref, DeleteCause delcause)
-    {
+    public ResidenceDeleteEvent(Player player, ClaimedResidence resref, DeleteCause delcause) {
         super("RESIDENCE_DELETE", resref, player);
         cause = delcause;
     }
 
-    public DeleteCause getCause()
-    {
+    public DeleteCause getCause() {
         return cause;
     }
 

src/main/java/com/bekvon/bukkit/residence/event/ResidenceEvent.java

@@ -17,6 +17,7 @@ import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 public class ResidenceEvent extends Event {
 
     private static final HandlerList handlers = new HandlerList();
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
@@ -25,8 +26,7 @@ public class ResidenceEvent extends Event {
 
     ClaimedResidence res;
 
-	public ResidenceEvent(String eventName, ClaimedResidence resref)
-	{
+    public ResidenceEvent(String eventName, ClaimedResidence resref) {
         message = eventName;
         res = resref;
     }
@@ -40,8 +40,7 @@ public class ResidenceEvent extends Event {
         return message;
     }
 
-	public ClaimedResidence getResidence()
-	{
+    public ClaimedResidence getResidence() {
         return res;
     }
 }

src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java

@@ -18,6 +18,7 @@ import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState;
 public class ResidenceFlagChangeEvent extends CancellableResidencePlayerFlagEvent {
 
     private static final HandlerList handlers = new HandlerList();
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
@@ -29,14 +30,12 @@ public class ResidenceFlagChangeEvent extends CancellableResidencePlayerFlagEven
 
     FlagState newstate;
 
-    public ResidenceFlagChangeEvent(ClaimedResidence resref, Player player, String flag, FlagType type,FlagState newState, String target)
-    {
+    public ResidenceFlagChangeEvent(ClaimedResidence resref, Player player, String flag, FlagType type, FlagState newState, String target) {
         super("RESIDENCE_FLAG_CHANGE", resref, player, flag, type, target);
         newstate = newState;
     }
 
-    public FlagState getNewState()
-    {
+    public FlagState getNewState() {
         return newstate;
     }
 

src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java

@@ -24,15 +24,14 @@ public class ResidenceFlagCheckEvent extends ResidenceFlagEvent {
 
     private boolean overridevalue;
     boolean defaultvalue;
-	public ResidenceFlagCheckEvent(ClaimedResidence resref, String flag, FlagType type, String target, boolean defaultValue)
-	{
+
+    public ResidenceFlagCheckEvent(ClaimedResidence resref, String flag, FlagType type, String target, boolean defaultValue) {
         super("RESIDENCE_FLAG_CHECK", resref, flag, type, target);
         defaultvalue = defaultValue;
         override = false;
     }
 
-	public boolean getDefaultValue()
-	{
+    public boolean getDefaultValue() {
         return defaultvalue;
     }
 
@@ -41,18 +40,15 @@ public class ResidenceFlagCheckEvent extends ResidenceFlagEvent {
         return handlers;
     }
 
-	public boolean getOverrideValue()
-	{
+    public boolean getOverrideValue() {
         return overridevalue;
     }
 
-	public boolean isOverriden()
-	{
+    public boolean isOverriden() {
         return override;
     }
 
-	public void overrideCheck(boolean flagval)
-	{
+    public void overrideCheck(boolean flagval) {
         overridevalue = flagval;
         override = true;
     }

src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java

@@ -17,6 +17,7 @@ import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState;
 public class ResidenceFlagEvent extends ResidenceEvent {
 
     private static final HandlerList handlers = new HandlerList();
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
@@ -26,9 +27,10 @@ public class ResidenceFlagEvent extends ResidenceEvent {
         return handlers;
     }
 
-    public enum FlagType
-    {
-        RESIDENCE,GROUP,PLAYER
+    public enum FlagType {
+        RESIDENCE,
+        GROUP,
+        PLAYER
     }
 
     String flagname;
@@ -36,26 +38,22 @@ public class ResidenceFlagEvent extends ResidenceEvent {
     FlagState flagstate;
     String flagtarget;
 
-    public ResidenceFlagEvent(String eventName, ClaimedResidence resref, String flag, FlagType type, String target)
-    {
+    public ResidenceFlagEvent(String eventName, ClaimedResidence resref, String flag, FlagType type, String target) {
         super(eventName, resref);
         flagname = flag;
         flagtype = type;
         flagtarget = target;
     }
 
-    public String getFlag()
-    {
+    public String getFlag() {
         return flagname;
     }
 
-    public FlagType getFlagType()
-    {
+    public FlagType getFlagType() {
         return flagtype;
     }
 
-    public String getFlagTargetPlayerOrGroup()
-    {
+    public String getFlagTargetPlayerOrGroup() {
         return flagtarget;
     }
 }

src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java

@@ -4,6 +4,7 @@
  */
 
 package com.bekvon.bukkit.residence.event;
+
 import org.bukkit.event.HandlerList;
 
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
@@ -15,6 +16,7 @@ import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 public class ResidenceOwnerChangeEvent extends ResidenceEvent {
 
     private static final HandlerList handlers = new HandlerList();
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
@@ -26,14 +28,12 @@ public class ResidenceOwnerChangeEvent extends ResidenceEvent {
 
     protected String newowner;
 
-    public ResidenceOwnerChangeEvent(ClaimedResidence resref, String newOwner)
-    {
+    public ResidenceOwnerChangeEvent(ClaimedResidence resref, String newOwner) {
         super("RESIDENCE_OWNER_CHANGE", resref);
         newowner = newOwner;
     }
 
-    public String getNewOwner()
-    {
+    public String getNewOwner() {
         return newowner;
     }
 }

src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEventInterface.java

@@ -13,6 +13,8 @@ import org.bukkit.entity.Player;
  */
 public interface ResidencePlayerEventInterface {
     public boolean isAdmin();
+
     public boolean isPlayer();
+
     public Player getPlayer();
 }

src/main/java/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java

@@ -6,18 +6,22 @@ public class ResidenceRenameEvent extends ResidenceEvent {
     protected String NewResName;
     protected String OldResName;
     protected ClaimedResidence res;
+
     public ResidenceRenameEvent(ClaimedResidence resref, String NewName, String OldName) {
         super("RESIDENCE_RENAME", resref);
         NewResName = NewName;
         OldResName = OldName;
         res = resref;
     }
+
     public String getNewResidenceName() {
         return NewResName;
     }
+
     public String getOldResidenceName() {
         return OldResName;
     }
+
     @Override
     public ClaimedResidence getResidence() {
         return res;

src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java

@@ -17,6 +17,7 @@ import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 public class ResidenceRentEvent extends CancellableResidencePlayerEvent {
 
     private static final HandlerList handlers = new HandlerList();
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
@@ -28,19 +29,20 @@ public class ResidenceRentEvent extends CancellableResidencePlayerEvent {
 
     RentEventType eventtype;
 
-    public enum RentEventType
-    {
-        RENT, UNRENT, RENTABLE, UNRENTABLE, RENT_EXPIRE
+    public enum RentEventType {
+        RENT,
+        UNRENT,
+        RENTABLE,
+        UNRENTABLE,
+        RENT_EXPIRE
     }
 
-    public ResidenceRentEvent(ClaimedResidence resref, Player player, RentEventType type)
-    {
+    public ResidenceRentEvent(ClaimedResidence resref, Player player, RentEventType type) {
         super("RESIDENCE_RENT_EVENT", resref, player);
         eventtype = type;
     }
 
-    public RentEventType getCause()
-    {
+    public RentEventType getCause() {
         return eventtype;
     }
 

src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java

@@ -18,6 +18,7 @@ import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 public class ResidenceTPEvent extends CancellableResidencePlayerEvent {
 
     private static final HandlerList handlers = new HandlerList();
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
@@ -29,20 +30,18 @@ public class ResidenceTPEvent extends CancellableResidencePlayerEvent {
 
     Player reqPlayer;
     Location loc;
-    public ResidenceTPEvent(ClaimedResidence resref, Location teleloc, Player player, Player reqplayer)
-    {
+
+    public ResidenceTPEvent(ClaimedResidence resref, Location teleloc, Player player, Player reqplayer) {
         super("RESIDENCE_TP", resref, player);
         reqPlayer = reqplayer;
         loc = teleloc;
     }
 
-    public Player getRequestingPlayer()
-    {
+    public Player getRequestingPlayer() {
         return reqPlayer;
     }
 
-    public Location getTeleportLocation()
-    {
+    public Location getTeleportLocation() {
         return loc;
     }
 }

src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java

@@ -18,6 +18,7 @@ import org.bukkit.entity.Player;
 
 import com.bekvon.bukkit.residence.event.ResidenceTPEvent;
 
+import cn.citycraft.PluginHelper.utils.CompatibleUtil;
 import cn.citycraft.Residence.ResidenceMain;
 import cn.citycraft.Residence.economy.ResidenceBank;
 import cn.citycraft.Residence.economy.TransactionManager;
@@ -448,7 +449,7 @@ public class ClaimedResidence {
 
     public ArrayList<Player> getPlayersInResidence() {
         final ArrayList<Player> within = new ArrayList<>();
-		for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
+        for (final Player player : CompatibleUtil.getOnlinePlayers()) {
             if (containsLoc(player.getLocation())) {
                 within.add(player);
             }