From 90254fc3d0870849e59a9241f4a5d2b8b3c33411 Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Sat, 17 Oct 2015 09:54:57 +0800
Subject: [PATCH] remove 1.7.2 Support...

Signed-off-by: 502647092 <jtb1@163.com>
---
 .../java/com/bekvon/bukkit/residence/ResidenceMain.java  | 9 +++------
 .../residence/listeners/ResidencePlayerListener.java     | 4 +---
 .../bukkit/residence/protection/ClaimedResidence.java    | 3 +--
 .../com/bekvon/bukkit/residence/runnable/HealTask.java   | 5 +----
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java b/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java
index e845cba..9870715 100644
--- a/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java
+++ b/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java
@@ -12,7 +12,6 @@ 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;
@@ -285,8 +284,7 @@ public class ResidenceMain extends JavaPlugin {
 		try {
 			final File worldFolder = new File(saveFolder, "Worlds");
 			if (!saveFolder.isDirectory()) {
-				this.getLogger().warning("领地数据保存目录不存在...");
-				this.getLogger().warning("请重新启动服务器生成新的文件...");
+				this.getLogger().warning("领地数据保存目录不存在 跳过载入...");
 				return true;
 			}
 			YMLSaveHelper yml;
@@ -326,7 +324,7 @@ public class ResidenceMain extends JavaPlugin {
 				yml.load();
 				rentmanager = RentManager.load(this, (Map<String, Object>) yml.getRoot().get("RentSystem"));
 			}
-			this.getLogger().info("从配置文件中读取领地数据,耗时 " + ((float) (System.currentTimeMillis() - time) / 1000) + " 秒");
+			this.getLogger().info("从配置文件中读取领地数据完毕,耗时 " + ((float) (System.currentTimeMillis() - time) / 1000) + " 秒");
 			return true;
 		} catch (final Exception ex) {
 			this.getLogger().warning("领地数据载入时发生错误,请报告以下内容给作者: ");
@@ -517,8 +515,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));
 			}
-			final Collection<? extends Player> plyers = Bukkit.getServer().getOnlinePlayers();
-			for (final Player player : plyers) {
+			for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
 				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 4757834..7d1f0b3 100644
--- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
+++ b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
@@ -6,7 +6,6 @@
 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;
@@ -71,8 +70,7 @@ public class ResidencePlayerListener implements Listener {
 		playerToggleChat = new ArrayList<String>();
 		minUpdateTime = plugin.getConfigManager().getMinMoveUpdateInterval();
 		chatenabled = plugin.getConfigManager().chatEnabled();
-		final Collection<? extends Player> plyers = Bukkit.getServer().getOnlinePlayers();
-		for (final Player player : plyers) {
+		for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
 			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 e027431..59da623 100644
--- a/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java
+++ b/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java
@@ -451,8 +451,7 @@ public class ClaimedResidence {
 
 	public ArrayList<Player> getPlayersInResidence() {
 		final ArrayList<Player> within = new ArrayList<Player>();
-		final Collection<? extends Player> plyers = Bukkit.getServer().getOnlinePlayers();
-		for (final Player player : plyers) {
+		for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
 			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 4a5c145..34516bd 100644
--- a/src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java
+++ b/src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java
@@ -1,7 +1,5 @@
 package com.bekvon.bukkit.residence.runnable;
 
-import java.util.Collection;
-
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Damageable;
 import org.bukkit.entity.Player;
@@ -19,8 +17,7 @@ public class HealTask implements Runnable {
 	@Override
 	public void run() {
 		try {
-			final Collection<? extends Player> plyers = Bukkit.getServer().getOnlinePlayers();
-			for (final Player player : plyers) {
+			for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
 				final String resname = plugin.getPlayerListener().getCurrentResidenceName(player.getName());
 				ClaimedResidence res = null;
 				if (resname != null) {