From b21e9d2b22190607c5cdea8b2412b3268a97a356 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Sat, 17 Oct 2015 09:37:35 +0800 Subject: [PATCH] fix 1.7.2 can't get OnlinePlayers... Signed-off-by: 502647092 --- src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java | 4 +++- .../bukkit/residence/listeners/ResidencePlayerListener.java | 4 +++- .../bekvon/bukkit/residence/protection/ClaimedResidence.java | 3 ++- .../java/com/bekvon/bukkit/residence/runnable/HealTask.java | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java b/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java index 55d300d..e845cba 100644 --- a/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java +++ b/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java @@ -12,6 +12,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -516,7 +517,8 @@ 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()) { + final Collection plyers = Bukkit.getServer().getOnlinePlayers(); + for (final Player player : plyers) { if (this.getPermissionManager().isResidenceAdmin(player)) { turnResAdminOn(player); } diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java index 7d1f0b3..4757834 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java +++ b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java @@ -6,6 +6,7 @@ package com.bekvon.bukkit.residence.listeners; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -70,7 +71,8 @@ public class ResidencePlayerListener implements Listener { playerToggleChat = new ArrayList(); minUpdateTime = plugin.getConfigManager().getMinMoveUpdateInterval(); chatenabled = plugin.getConfigManager().chatEnabled(); - for (final Player player : Bukkit.getServer().getOnlinePlayers()) { + final Collection plyers = Bukkit.getServer().getOnlinePlayers(); + for (final Player player : plyers) { lastUpdate.put(player.getName(), System.currentTimeMillis()); } } diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java b/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java index 59da623..e027431 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java @@ -451,7 +451,8 @@ public class ClaimedResidence { public ArrayList getPlayersInResidence() { final ArrayList within = new ArrayList(); - for (final Player player : Bukkit.getServer().getOnlinePlayers()) { + final Collection plyers = Bukkit.getServer().getOnlinePlayers(); + for (final Player player : plyers) { if (this.containsLoc(player.getLocation())) { within.add(player); } diff --git a/src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java b/src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java index 34516bd..4a5c145 100644 --- a/src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java +++ b/src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java @@ -1,5 +1,7 @@ package com.bekvon.bukkit.residence.runnable; +import java.util.Collection; + import org.bukkit.Bukkit; import org.bukkit.entity.Damageable; import org.bukkit.entity.Player; @@ -17,7 +19,8 @@ public class HealTask implements Runnable { @Override public void run() { try { - for (final Player player : Bukkit.getServer().getOnlinePlayers()) { + final Collection plyers = Bukkit.getServer().getOnlinePlayers(); + for (final Player player : plyers) { final String resname = plugin.getPlayerListener().getCurrentResidenceName(player.getName()); ClaimedResidence res = null; if (resname != null) {