diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 3c8a079..7e6ea0e 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -97,6 +97,21 @@ public HashMap getCharacters() { return characterMap; } + + @JSONHint(ignore = true) + public HashMap getCharacters(String accountURI) { + if (accountURI == null || accountURI.isEmpty()) { + return getCharacters(); + } + HashMap returnedMap = new HashMap<>(); + for (String id : characterMap.keySet()) { + Character character = characterMap.get(id); + if (character.getAccountURI().equals(accountURI)) { + returnedMap.put(id, character); + } + } + return returnedMap; + } public Character getCharacter(String characterId) { return characterMap.get(characterId); diff --git a/src/main/java/cactusServer/models/CharacterModelManager.java b/src/main/java/cactusServer/models/CharacterModelManager.java index 8c9ff88..c91f1a7 100644 --- a/src/main/java/cactusServer/models/CharacterModelManager.java +++ b/src/main/java/cactusServer/models/CharacterModelManager.java @@ -14,7 +14,7 @@ private static CharacterModelManager theInstance = null; private HashMap characterModels = new HashMap<>(); private int nextKey = 0; - private static final String MODEL_PATH = "..\\..\\"; + private static final String MODEL_PATH = "../../"; private CharacterModelManager() { initCharacterModels();