diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 0b6d6b4..03f6d6f 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -3,8 +3,6 @@ import java.util.HashMap; import java.util.HashSet; -import javax.json.bind.annotation.JsonbTransient; - import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; @@ -99,7 +97,7 @@ public HashMap getCharacters() { return characterMap; } - + public HashMap getCharacters(String accountURI) { if (accountURI == null || accountURI.isEmpty()) { return getCharacters(); diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 3ec5e45..6728b16 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -42,7 +42,7 @@ // ��������Instance������Universe��placeable��z�u���� String[] instanceURISplit = instanceURI.split("/"); // �c�c/instances/{instanceId} String instanceId = instanceURISplit[instanceURISplit.length - 1]; -// Instances.getInstance().getInstance(instanceId).getUniverse().place(this.getPlaceable()); + Instances.getInstance().getInstance(instanceId).getUniverse().place(this.getPlaceable()); } public String getInstanceURI() {