From bfd93c2e7c050a8fb8ec7fc4e31756c8d2c8a7cb Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Tue, 2 Dec 2014 13:32:29 -0800 Subject: [PATCH] Adjusted for breaking changes in 1.8. --- .../GriefPrevention/BlockEventHandler.java | 6 +++--- .../GriefPrevention/DeliverClaimBlocksTask.java | 4 +++- .../GriefPrevention/GriefPrevention.java | 6 +++--- .../GriefPrevention/PlayerEventHandler.java | 14 +++++++------- .../GriefPrevention/SecureClaimTask.java | 7 ++++--- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java b/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java index f48786f..32a45a9 100644 --- a/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java @@ -19,6 +19,7 @@ package me.ryanhamshire.GriefPrevention; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.bukkit.ChatColor; @@ -122,10 +123,9 @@ public class BlockEventHandler implements Listener if(!player.hasPermission("griefprevention.eavesdrop")) { - Player [] players = GriefPrevention.instance.getServer().getOnlinePlayers(); - for(int i = 0; i < players.length; i++) + Collection players = (Collection)GriefPrevention.instance.getServer().getOnlinePlayers(); + for(Player otherPlayer : players) { - Player otherPlayer = players[i]; if(otherPlayer.hasPermission("griefprevention.eavesdrop")) { otherPlayer.sendMessage(ChatColor.GRAY + player.getName() + "(sign): " + signMessage); diff --git a/src/me/ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java b/src/me/ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java index 7d07fc5..854b3dd 100644 --- a/src/me/ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java +++ b/src/me/ryanhamshire/GriefPrevention/DeliverClaimBlocksTask.java @@ -18,6 +18,8 @@ package me.ryanhamshire.GriefPrevention; +import java.util.Collection; + import org.bukkit.Location; import org.bukkit.entity.Player; @@ -39,7 +41,7 @@ class DeliverClaimBlocksTask implements Runnable //if no player specified, this task will create a player-specific task for each online player, scheduled one tick apart if(this.player == null) { - Player [] players = GriefPrevention.instance.getServer().getOnlinePlayers(); + Collection players = (Collection)GriefPrevention.instance.getServer().getOnlinePlayers(); long i = 0; for(Player onlinePlayer : players) diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index d6b8a94..8d7a080 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -2349,10 +2350,9 @@ public class GriefPrevention extends JavaPlugin public void onDisable() { //save data for any online players - Player [] players = this.getServer().getOnlinePlayers(); - for(int i = 0; i < players.length; i++) + Collection players = (Collection)this.getServer().getOnlinePlayers(); + for(Player player : players) { - Player player = players[i]; UUID playerID = player.getUniqueId(); PlayerData playerData = this.dataStore.getPlayerData(playerID); this.dataStore.savePlayerDataSync(playerID, playerData); diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 157e808..24d4880 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -20,6 +20,7 @@ package me.ryanhamshire.GriefPrevention; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.Collection; import java.util.Date; import java.util.HashSet; import java.util.List; @@ -405,10 +406,9 @@ class PlayerEventHandler implements Listener String logMessage = logMessageBuilder.toString(); - Player [] players = GriefPrevention.instance.getServer().getOnlinePlayers(); - for(int i = 0; i < players.length; i++) + Collection players = (Collection)GriefPrevention.instance.getServer().getOnlinePlayers(); + for(Player player : players) { - Player player = players[i]; if(player.hasPermission("griefprevention.eavesdrop") && !player.getName().equalsIgnoreCase(args[1])) { player.sendMessage(ChatColor.GRAY + logMessage); @@ -563,12 +563,12 @@ class PlayerEventHandler implements Listener GriefPrevention.AddLogEntry("Auto-banned " + player.getName() + " because that account is using an IP address very recently used by banned player " + info.bannedAccountName + " (" + info.address.toString() + ")."); //notify any online ops - Player [] players = GriefPrevention.instance.getServer().getOnlinePlayers(); - for(int k = 0; k < players.length; k++) + Collection players = (Collection)GriefPrevention.instance.getServer().getOnlinePlayers(); + for(Player otherPlayer : players) { - if(players[k].isOp()) + if(otherPlayer.isOp()) { - GriefPrevention.sendMessage(players[k], TextMode.Success, Messages.AutoBanNotify, player.getName(), info.bannedAccountName); + GriefPrevention.sendMessage(otherPlayer, TextMode.Success, Messages.AutoBanNotify, player.getName(), info.bannedAccountName); } } diff --git a/src/me/ryanhamshire/GriefPrevention/SecureClaimTask.java b/src/me/ryanhamshire/GriefPrevention/SecureClaimTask.java index b91294d..bc17073 100644 --- a/src/me/ryanhamshire/GriefPrevention/SecureClaimTask.java +++ b/src/me/ryanhamshire/GriefPrevention/SecureClaimTask.java @@ -18,6 +18,8 @@ package me.ryanhamshire.GriefPrevention; +import java.util.Collection; + import org.bukkit.entity.Player; //secures a claim after a siege looting window has closed @@ -41,10 +43,9 @@ class SecureClaimTask implements Runnable claim.doorsOpen = false; //eject bad guys - Player [] onlinePlayers = GriefPrevention.instance.getServer().getOnlinePlayers(); - for(int j = 0; j < onlinePlayers.length; j++) + Collection onlinePlayers = (Collection)GriefPrevention.instance.getServer().getOnlinePlayers(); + for(Player player : onlinePlayers) { - Player player = onlinePlayers[j]; if(claim.contains(player.getLocation(), false, false) && claim.allowAccess(player) != null) { GriefPrevention.sendMessage(player, TextMode.Err, Messages.SiegeDoorsLockedEjection);