502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-24 21:46:16 +00:00
Code Releases Activity

remove 1.7.2 Support...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-10-17 09:54:57 +08:00
parent b21e9d2b22
commit 90254fc3d0
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java
View File

@@ -12,7 +12,6 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -285,8 +284,7 @@ public class ResidenceMain extends JavaPlugin {
try { try {
final File worldFolder = new File(saveFolder, "Worlds"); final File worldFolder = new File(saveFolder, "Worlds");
if (!saveFolder.isDirectory()) { if (!saveFolder.isDirectory()) {
this.getLogger().warning("领地数据保存目录不存在..."); this.getLogger().warning("领地数据保存目录不存在 跳过载入...");
this.getLogger().warning("请重新启动服务器生成新的文件...");
return true; return true;
} }
YMLSaveHelper yml; YMLSaveHelper yml;
@@ -326,7 +324,7 @@ public class ResidenceMain extends JavaPlugin {
yml.load(); yml.load();
rentmanager = RentManager.load(this, (Map<String, Object>) yml.getRoot().get("RentSystem")); 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; return true;
} catch (final Exception ex) { } catch (final Exception ex) {
this.getLogger().warning("领地数据载入时发生错误,请报告以下内容给作者: "); this.getLogger().warning("领地数据载入时发生错误,请报告以下内容给作者: ");
@@ -517,8 +515,7 @@ public class ResidenceMain extends JavaPlugin {
rentint = rentint < 1 ? 1 : rentint * 60 * 20; rentint = rentint < 1 ? 1 : rentint * 60 * 20;
taskmanager.add(this.getServer().getScheduler().runTaskTimerAsynchronously(this, new RentTask(this), rentint, rentint)); taskmanager.add(this.getServer().getScheduler().runTaskTimerAsynchronously(this, new RentTask(this), rentint, rentint));
} }
final Collection<? extends Player> plyers = Bukkit.getServer().getOnlinePlayers(); for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
for (final Player player : plyers) {
if (this.getPermissionManager().isResidenceAdmin(player)) { if (this.getPermissionManager().isResidenceAdmin(player)) {
turnResAdminOn(player); turnResAdminOn(player);
} }

4
src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
View File

@@ -6,7 +6,6 @@
package com.bekvon.bukkit.residence.listeners; package com.bekvon.bukkit.residence.listeners;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -71,8 +70,7 @@ public class ResidencePlayerListener implements Listener {
playerToggleChat = new ArrayList<String>(); playerToggleChat = new ArrayList<String>();
minUpdateTime = plugin.getConfigManager().getMinMoveUpdateInterval(); minUpdateTime = plugin.getConfigManager().getMinMoveUpdateInterval();
chatenabled = plugin.getConfigManager().chatEnabled(); chatenabled = plugin.getConfigManager().chatEnabled();
final Collection<? extends Player> plyers = Bukkit.getServer().getOnlinePlayers(); for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
for (final Player player : plyers) {
lastUpdate.put(player.getName(), System.currentTimeMillis()); lastUpdate.put(player.getName(), System.currentTimeMillis());
} }
} }

3
src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java
View File

@@ -451,8 +451,7 @@ public class ClaimedResidence {
public ArrayList<Player> getPlayersInResidence() { public ArrayList<Player> getPlayersInResidence() {
final ArrayList<Player> within = new ArrayList<Player>(); final ArrayList<Player> within = new ArrayList<Player>();
final Collection<? extends Player> plyers = Bukkit.getServer().getOnlinePlayers(); for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
for (final Player player : plyers) {
if (this.containsLoc(player.getLocation())) { if (this.containsLoc(player.getLocation())) {
within.add(player); within.add(player);
} }

5
src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java
View File

@@ -1,7 +1,5 @@
package com.bekvon.bukkit.residence.runnable; package com.bekvon.bukkit.residence.runnable;
import java.util.Collection;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Damageable; import org.bukkit.entity.Damageable;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -19,8 +17,7 @@ public class HealTask implements Runnable {
@Override @Override
public void run() { public void run() {
try { try {
final Collection<? extends Player> plyers = Bukkit.getServer().getOnlinePlayers(); for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
for (final Player player : plyers) {
final String resname = plugin.getPlayerListener().getCurrentResidenceName(player.getName()); final String resname = plugin.getPlayerListener().getCurrentResidenceName(player.getName());
ClaimedResidence res = null; ClaimedResidence res = null;
if (resname != null) { if (resname != null) {