diff --git a/Plugins/Libraries/bukkit.jar b/Plugins/Libraries/bukkit.jar index 4aadd1b77..a0bfc9342 100644 Binary files a/Plugins/Libraries/bukkit.jar and b/Plugins/Libraries/bukkit.jar differ diff --git a/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml b/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml index be0d60967..4b45c6271 100644 --- a/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml +++ b/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml @@ -8,6 +8,7 @@ + diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java index ae270bbe4..bfb69d72c 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java @@ -9,9 +9,9 @@ public class UtilServer { public static Player[] getPlayers() { - return getServer().getOnlinePlayers(); + return getServer().getOnlinePlayers().toArray(new Player[0]); } - + public static Server getServer() { return Bukkit.getServer(); diff --git a/Plugins/Mineplex.Core/Mineplex.Core.iml b/Plugins/Mineplex.Core/Mineplex.Core.iml index 7caa9164c..7772ccd8d 100644 --- a/Plugins/Mineplex.Core/Mineplex.Core.iml +++ b/Plugins/Mineplex.Core/Mineplex.Core.iml @@ -10,12 +10,13 @@ - - - - + + + + + diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java index 98fea4f14..538d901a9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java @@ -217,7 +217,7 @@ public class CoreClientManager extends MiniPlugin client.SetPlayer(event.getPlayer()); // Reserved Slot Check - if (Bukkit.getOnlinePlayers().length >= Bukkit.getServer().getMaxPlayers()) + if (Bukkit.getOnlinePlayers().size() >= Bukkit.getServer().getMaxPlayers()) { if (client.GetRank().Has(event.getPlayer(), Rank.ULTRA, false)) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java index e5f1d14d5..66b107d9d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java @@ -357,7 +357,7 @@ public class AntiHack extends MiniPlugin UtilServer.broadcast(F.main("MAC", player.getName() + " was kicked for suspicious movement.")); - ServerListPingEvent event = new ServerListPingEvent(null, Bukkit.getServer().getMotd(), Bukkit.getServer().getOnlinePlayers().length, Bukkit.getServer().getMaxPlayers()); + ServerListPingEvent event = new ServerListPingEvent(null, Bukkit.getServer().getMotd(), Bukkit.getServer().getOnlinePlayers().size(), Bukkit.getServer().getMaxPlayers()); GetPluginManager().callEvent(event); String motd = event.getMotd(); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java index c9912fcc8..6bde47c27 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java @@ -15,6 +15,7 @@ import mineplex.core.MiniClientPlugin; import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.common.util.F; import mineplex.core.common.util.NautHashMap; +import mineplex.core.common.util.UtilServer; import mineplex.core.friend.command.AddFriend; import mineplex.core.friend.command.DeleteFriend; import mineplex.core.friend.data.FriendData; @@ -93,14 +94,14 @@ public class FriendManager extends MiniClientPlugin implements IPack @EventHandler public void updateFriends(UpdateEvent event) { - if (event.getType() != UpdateType.SLOW || Bukkit.getOnlinePlayers().length == 0) + if (event.getType() != UpdateType.SLOW || Bukkit.getOnlinePlayers().size() == 0) return; Bukkit.getServer().getScheduler().runTaskAsynchronously(_plugin, new Runnable() { public void run() { - final NautHashMap newData = _repository.getFriendsForAll(Bukkit.getOnlinePlayers()); + final NautHashMap newData = _repository.getFriendsForAll(UtilServer.getPlayers()); Bukkit.getServer().getScheduler().runTask(_plugin, new Runnable() { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java index 44d7de506..1c99c7134 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java @@ -153,7 +153,7 @@ public class Portal extends MiniPlugin @EventHandler public void checkForServerTransfers(UpdateEvent event) { - if (event.getType() != UpdateType.SEC || Bukkit.getOnlinePlayers().length == 0) + if (event.getType() != UpdateType.SEC || Bukkit.getOnlinePlayers().size() == 0) return; _retrieve = !_retrieve; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java index 0e7cf59f7..227e4cbfb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java @@ -131,11 +131,11 @@ public class ServerStatusManager extends MiniPlugin */ private MinecraftServer generateServerSnapshot() { - ServerListPingEvent event = new ServerListPingEvent(null, GetPlugin().getServer().getMotd(), GetPlugin().getServer().getOnlinePlayers().length, GetPlugin().getServer().getMaxPlayers()); + ServerListPingEvent event = new ServerListPingEvent(null, GetPlugin().getServer().getMotd(), GetPlugin().getServer().getOnlinePlayers().size(), GetPlugin().getServer().getMaxPlayers()); GetPluginManager().callEvent(event); String motd = event.getMotd(); - int playerCount = Bukkit.getOnlinePlayers().length; + int playerCount = Bukkit.getOnlinePlayers().size(); int maxPlayerCount = event.getMaxPlayers(); int tps = (int) _lagMeter.getTicksPerSecond(); String address = Bukkit.getServer().getIp().isEmpty() ? "localhost" : Bukkit.getServer().getIp(); diff --git a/Plugins/Mineplex.Hub/Mineplex.Hub.iml b/Plugins/Mineplex.Hub/Mineplex.Hub.iml index 6b8306237..d448c1c6b 100644 --- a/Plugins/Mineplex.Hub/Mineplex.Hub.iml +++ b/Plugins/Mineplex.Hub/Mineplex.Hub.iml @@ -14,6 +14,7 @@ + diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 08e27afae..bb961500b 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -447,7 +447,7 @@ public class HubManager extends MiniClientPlugin CoreClient client = _clientManager.Get(event.getPlayer().getName()); // Reserved Slot Check - if (Bukkit.getOnlinePlayers().length - Bukkit.getServer().getMaxPlayers() >= 20) + if (Bukkit.getOnlinePlayers().size() - Bukkit.getServer().getMaxPlayers() >= 20) { if (!client.GetRank().Has(Rank.ULTRA)) { diff --git a/Plugins/Mineplex.MapParser/Mineplex.MapParser.iml b/Plugins/Mineplex.MapParser/Mineplex.MapParser.iml index d4443f18f..aa984665f 100644 --- a/Plugins/Mineplex.MapParser/Mineplex.MapParser.iml +++ b/Plugins/Mineplex.MapParser/Mineplex.MapParser.iml @@ -8,6 +8,7 @@ + diff --git a/Plugins/Mineplex.Minecraft.BungeeSigns/src/mineplex/minecraft/BungeeSigns/BungeeSigns.java b/Plugins/Mineplex.Minecraft.BungeeSigns/src/mineplex/minecraft/BungeeSigns/BungeeSigns.java index b0c24427b..789479930 100644 --- a/Plugins/Mineplex.Minecraft.BungeeSigns/src/mineplex/minecraft/BungeeSigns/BungeeSigns.java +++ b/Plugins/Mineplex.Minecraft.BungeeSigns/src/mineplex/minecraft/BungeeSigns/BungeeSigns.java @@ -190,7 +190,7 @@ public class BungeeSigns extends JavaPlugin implements Listener, PluginMessageLi public void run() { - if (getServer().getOnlinePlayers().length > 0) + if (getServer().getOnlinePlayers().size() > 0) { for (String serverName : _signs.keySet()) { @@ -211,7 +211,7 @@ public class BungeeSigns extends JavaPlugin implements Listener, PluginMessageLi e.printStackTrace(); } - getServer().getOnlinePlayers()[0].sendPluginMessage(this, "BungeeSigns", b.toByteArray()); + getServer().getOnlinePlayers().iterator().next().sendPluginMessage(this, "BungeeSigns", b.toByteArray()); if (_signUpdate.get(serverName) != -1L && System.currentTimeMillis() - _signUpdate.get(serverName) > 5000) { diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml b/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml index 0bffff66a..d69a27099 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml @@ -11,6 +11,7 @@ + diff --git a/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml b/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml index 569e314c3..15a07ba31 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml +++ b/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml @@ -10,6 +10,7 @@ + diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/MinecraftServer.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/MinecraftServer.java index 48f626d1a..c8900e42c 100644 --- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/MinecraftServer.java +++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/MinecraftServer.java @@ -29,7 +29,7 @@ public class MinecraftServer // The maximum number of players allowed on the server. private int _maxPlayerCount; public int getMaxPlayerCount() { return _maxPlayerCount; } - + // The ticks per second (TPS) of the server. private int _tps; public int getTps() { return _tps; } diff --git a/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml b/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml index fbc647369..f5e0d0783 100644 --- a/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml +++ b/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml @@ -12,6 +12,7 @@ + diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index c42ea3597..7cbba9ff1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -61,7 +61,7 @@ public class Arcade extends JavaPlugin @Override public void onEnable() - { + { //Delete Old Games Folders DeleteFolders(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 962c3f4c5..1e01d1475 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -565,7 +565,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation } // Reserved Slot Check - if (Bukkit.getOnlinePlayers().length >= Bukkit.getServer().getMaxPlayers()) + if (Bukkit.getOnlinePlayers().size() >= Bukkit.getServer().getMaxPlayers()) { if (_serverStatusManager.getCurrentServerName().contains("BETA")) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/powerups/PowerUpManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/powerups/PowerUpManager.java index edb220a3d..a14246b6e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/powerups/PowerUpManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/powerups/PowerUpManager.java @@ -226,7 +226,7 @@ public class PowerUpManager implements Listener if (getGame().GetState() != GameState.Live) return; - Player[] players = Bukkit.getOnlinePlayers(); + Collection players = Bukkit.getOnlinePlayers(); for (Player player : players) {