From 4927bb8c0b6b1fcebe41adf9f38489fe82116cfa Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 17 Jan 2016 20:20:48 +1100 Subject: [PATCH] Fix some misc suspicious calls to Collection methods. --- .../src/mineplex/core/CustomTagFix.java | 2 +- .../game/clans/clans/observer/ObserverManager.java | 2 +- .../src/mineplex/hub/server/ServerManager.java | 12 +----------- .../game/core/explosion/CustomExplosion.java | 4 +--- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java index af619626b..bc0e5e572 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java @@ -80,7 +80,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook _entityMap.remove(event.getPlayer().getName()); _entityNameMap.remove(event.getPlayer().getName()); _entityRiding.remove(event.getPlayer().getName()); - _loggedIn.remove(event.getPlayer()); + _loggedIn.remove(event.getPlayer().getName()); } @EventHandler(priority = EventPriority.LOW) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java index 59055ea02..7e84a14af 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java @@ -136,7 +136,7 @@ public class ObserverManager extends MiniPlugin if (_observerMap.containsKey(event.getPlayer())) { restore(event.getPlayer(), _observerMap.get(event.getPlayer())); - _observerMap.remove(_plugin); + _observerMap.remove(event.getPlayer()); } } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index 59b019540..a70d04559 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -295,17 +295,7 @@ public class ServerManager extends MiniPlugin return timeLeft; } - - public void removeServer(String serverName) - { - for (String key : _serverKeyInfoMap.keySet()) - { - _serverKeyInfoMap.get(key).remove(serverName); - } - - _serverInfoMap.remove(serverName); - } - + public void addServerGroup(ServerGroup serverGroup) { _serverKeyInfoMap.put(serverGroup.getPrefix(), new HashSet()); diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java index d5c86a91f..fed9d16ff 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java @@ -356,12 +356,10 @@ public class CustomExplosion extends Explosion if (_fallingBlockExplosion) { - Collection blocks = event.GetBlocks(); + List blocks = new ArrayList<>(event.GetBlocks()); if (blocks.size() > _maxFallingBlocks) { - blocks = new ArrayList(blocks); - Collections.shuffle((ArrayList) blocks); int toRemove = blocks.size() - _maxFallingBlocks;