skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LinkedList -> ArrayList

Browse Source
This commit is contained in:
garbagemule
2013-09-08 00:00:17 +02:00
parent 80abcf5f24
commit 8a1e74a1a4
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/garbagemule/MobArena/ArenaMasterImpl.java
+10 -11
View File
@@ -4,7 +4,6 @@ import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -54,7 +53,7 @@ public class ArenaMasterImpl implements ArenaMaster
this.plugin = plugin; this.plugin = plugin;
this.config = plugin.getConfig(); this.config = plugin.getConfig();
this.arenas = new LinkedList<Arena>(); this.arenas = new ArrayList<Arena>();
this.arenaMap = new HashMap<Player, Arena>(); this.arenaMap = new HashMap<Player, Arena>();
this.classes = new HashMap<String, ArenaClass>(); this.classes = new HashMap<String, ArenaClass>();
@@ -122,7 +121,7 @@ public class ArenaMasterImpl implements ArenaMaster
} }
public List<Arena> getEnabledArenas(List<Arena> arenas) { public List<Arena> getEnabledArenas(List<Arena> arenas) {
List<Arena> result = new LinkedList<Arena>(); List<Arena> result = new ArrayList<Arena>(arenas.size());
for (Arena arena : arenas) for (Arena arena : arenas)
if (arena.isEnabled()) if (arena.isEnabled())
result.add(arena); result.add(arena);
@@ -130,7 +129,7 @@ public class ArenaMasterImpl implements ArenaMaster
} }
public List<Arena> getPermittedArenas(Player p) { public List<Arena> getPermittedArenas(Player p) {
List<Arena> result = new LinkedList<Arena>(); List<Arena> result = new ArrayList<Arena>(arenas.size());
for (Arena arena : arenas) for (Arena arena : arenas)
if (plugin.has(p, "mobarena.arenas." + arena.configName())) if (plugin.has(p, "mobarena.arenas." + arena.configName()))
result.add(arena); result.add(arena);
@@ -138,7 +137,7 @@ public class ArenaMasterImpl implements ArenaMaster
} }
public List<Arena> getEnabledAndPermittedArenas(Player p) { public List<Arena> getEnabledAndPermittedArenas(Player p) {
List<Arena> result = new LinkedList<Arena>(); List<Arena> result = new ArrayList<Arena>(arenas.size());
for (Arena arena : arenas) for (Arena arena : arenas)
if (arena.isEnabled() && plugin.has(p, "mobarena.arenas." + arena.configName())) if (arena.isEnabled() && plugin.has(p, "mobarena.arenas." + arena.configName()))
result.add(arena); result.add(arena);
@@ -153,7 +152,7 @@ public class ArenaMasterImpl implements ArenaMaster
} }
public List<Arena> getArenasInWorld(World world) { public List<Arena> getArenasInWorld(World world) {
List<Arena> result = new LinkedList<Arena>(); List<Arena> result = new ArrayList<Arena>(arenas.size());
for (Arena arena : arenas) for (Arena arena : arenas)
if (arena.getWorld().equals(world)) if (arena.getWorld().equals(world))
result.add(arena); result.add(arena);
@@ -161,7 +160,7 @@ public class ArenaMasterImpl implements ArenaMaster
} }
public List<Player> getAllPlayers() { public List<Player> getAllPlayers() {
List<Player> result = new LinkedList<Player>(); List<Player> result = new ArrayList<Player>(arenas.size());
for (Arena arena : arenas) for (Arena arena : arenas)
result.addAll(arena.getAllPlayers()); result.addAll(arena.getAllPlayers());
return result; return result;
@@ -169,11 +168,11 @@ public class ArenaMasterImpl implements ArenaMaster
public List<Player> getAllPlayersInArena(String arenaName) { public List<Player> getAllPlayersInArena(String arenaName) {
Arena arena = getArenaWithName(arenaName); Arena arena = getArenaWithName(arenaName);
return (arena != null) ? new LinkedList<Player>(arena.getPlayersInArena()) : new LinkedList<Player>(); return (arena != null) ? new ArrayList<Player>(arena.getPlayersInArena()) : new ArrayList<Player>();
} }
public List<Player> getAllLivingPlayers() { public List<Player> getAllLivingPlayers() {
List<Player> result = new LinkedList<Player>(); List<Player> result = new ArrayList<Player>();
for (Arena arena : arenas) for (Arena arena : arenas)
result.addAll(arena.getPlayersInArena()); result.addAll(arena.getPlayersInArena());
return result; return result;
@@ -181,7 +180,7 @@ public class ArenaMasterImpl implements ArenaMaster
public List<Player> getLivingPlayersInArena(String arenaName) { public List<Player> getLivingPlayersInArena(String arenaName) {
Arena arena = getArenaWithName(arenaName); Arena arena = getArenaWithName(arenaName);
return (arena != null) ? new LinkedList<Player>(arena.getPlayersInArena()) : new LinkedList<Player>(); return (arena != null) ? new ArrayList<Player>(arena.getPlayersInArena()) : new ArrayList<Player>();
} }
public Arena getArenaWithPlayer(Player p) { public Arena getArenaWithPlayer(Player p) {
@@ -500,7 +499,7 @@ public class ArenaMasterImpl implements ArenaMaster
createArenaNode(section, "default", plugin.getServer().getWorlds().get(0), false); createArenaNode(section, "default", plugin.getServer().getWorlds().get(0), false);
} }
arenas = new LinkedList<Arena>(); arenas = new ArrayList<Arena>();
for (World w : Bukkit.getServer().getWorlds()) { for (World w : Bukkit.getServer().getWorlds()) {
loadArenasInWorld(w.getName()); loadArenasInWorld(w.getName());
} }