diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 9b19fbf..1c46d45 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -3,12 +3,8 @@ import java.net.URI; import java.util.HashMap; import java.util.Map; -import java.util.Set; -import java.util.UUID; import framework.model3D.Position3D; -import framework.physics.AngularVelocity3D; -import framework.physics.Velocity3D; import net.arnx.jsonic.JSONHint; public class Character { @@ -59,14 +55,6 @@ public Item getItemMap(String itemId) { return itemMap.get(itemId); } - - public void setAccountURI(URI accountURI) { - this.accountURI = accountURI; - } - - public void setName(String name) { - this.name = name; - } public void setPosition(Position3D position) { this.position = position; diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index f7fcd90..9ee6e0b 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -4,9 +4,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Random; import java.util.Set; -import java.util.UUID; import cactusServer.entities.Area.Allowed; import cactusServer.entities.Object; @@ -83,16 +81,16 @@ } public Map getCharacterMap(String accountUniqueId) { - Map map = new HashMap<>(); + Map accountCharacterMap = new HashMap<>(); for (Map.Entry entry : characterMap.entrySet()) { Character character = entry.getValue(); URI accountURI = character.getAccountURI(); - if (true) { - // if���̏����ɂ�accountURI���炽�ǂ��account������id�Ƃ̏ƍ������� - map.put(entry.getKey(), character); + if (accountUniqueId.equals("")) { + // if���̏����ɂ�accountURI�Ɋ܂܂��accountId�ƈ�����id�Ƃ̏ƍ������� + accountCharacterMap.put(entry.getKey(), character); } } - return map; + return accountCharacterMap; } public Character getCharacter(String characterId) { @@ -130,6 +128,12 @@ }; } + public Character updateCharacter(String characterId, Position3D position) { + Character character = characterMap.get(characterId); + character.setPosition(position); + return character; + } + public Character destroyCharacter(String characterId) { return characterMap.remove(characterId); } diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index caccf82..a42d1c9 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -1,10 +1,7 @@ package cactusServer.models; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; -import java.util.UUID; import org.apache.commons.lang3.RandomStringUtils;