diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index d04e582..40dfe65 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -22,14 +22,14 @@ @JSONHint(ignore = true) HashMap itemMap = new HashMap<>(); @JSONHint(ignore = true) private static final int UNIQUE_ID_LENGTH = 12; - public Character(URI accountURI, String name, Position3D position, String areaId, boolean isActive) { - this.accountURI = accountURI; - this.name = name; - this.position = position; - this.areaID = areaId; - this.isActive = isActive; - } - +// public Character(URI accountURI, String name, Position3D position, String areaId, boolean isActive) { +// this.accountURI = accountURI; +// this.name = name; +// this.position = position; +// this.areaID = areaId; +// this.isActive = isActive; +// } + public URI getAccountURI() { return accountURI; } @@ -62,9 +62,21 @@ return itemList; } + public void setAccountURI(URI accountURI) { + this.accountURI = accountURI; + } + + public void setName(String name) { + this.name = name; + } + public void setPosition(Position3D position) { this.position = position; } + + public void setAreaID(String areaID) { + this.areaID = areaID; + } public void setActive(boolean isActive) { this.isActive = isActive; diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 09f9a1e..4586393 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -91,6 +91,10 @@ return characterMap.get(characterId); } + public void setName(String name) { + this.name = name; + } + public void setState(State state) { this.state = state; } @@ -113,9 +117,17 @@ }; } - public Map createCharacter(URI accountURI, String name, Position3D position, String areaId, boolean isActive) { +// public Map createCharacter(URI accountURI, String name, Position3D position, String areaId, boolean isActive) { +// String id = new RandomStringGenerator().createUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, characterMap.keySet()); +// Character character = new Character(accountURI, name, position, areaId, isActive); +// characterMap.put(id, character); +// return new HashMap() { +// {put(id, character);} +// }; +// } + + public Map createCharacter(Character character) { String id = new RandomStringGenerator().createUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, characterMap.keySet()); - Character character = new Character(accountURI, name, position, areaId, isActive); characterMap.put(id, character); return new HashMap() { {put(id, character);} diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index a42d1c9..48e2bcc 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -39,13 +39,11 @@ /** * �V����Instance���쐬����Map�ɒlj����� * - * @param name - * �C���X�^���X�� (��) + * @param instance * @return �V�����쐬���ꂽID��Instance��Map */ - public Map createInstance(String name) { + public Map createInstance(Instance instance) { String id = new RandomStringGenerator().createUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, instanceMap.keySet()); - Instance instance = new Instance(name, Instance.State.AVAILABLE); instanceMap.put(id, instance); return new HashMap() { {put(id, instance);}