diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 650f494..cf4504b 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -83,11 +83,7 @@ @JSONHint(ignore = true) public List getCharacters() { - List characters = new ArrayList<>(); - for (Character character : characterMap.values()) { - characters.add(character); - } - return characters; + return new ArrayList(characterMap.values()); } @JSONHint(ignore = true) diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index d57dd01..6d44cf2 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -78,13 +78,9 @@ return instanceMap.get(instanceId); } -// public List getPlayers() { -// //playerMap.values().toArray() -//// List players = new ArrayList<>(); -//// for (Player player : playerMap.values().) { -//// //players. -//// } -// } + public List getPlayers() { + return new ArrayList(playerMap.values()); + } public Player getPlayer(String playerId) { return playerMap.get(playerId);