diff --git a/src/main/java/cactusServer/entities/Entity3D.java b/src/main/java/cactusServer/entities/Entity3D.java index 59caad6..92ed3be 100644 --- a/src/main/java/cactusServer/entities/Entity3D.java +++ b/src/main/java/cactusServer/entities/Entity3D.java @@ -19,6 +19,7 @@ return placeable; } + @JSONHint(ignore = true) public void setPlaceable(Placeable placeable) { this.placeable = placeable; } diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 12d0099..c7186b7 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -144,18 +144,6 @@ objMap.put(id, object); return new IDAddressedEntity(id, object); } - - /** - * InstancesRest�Ƃ̃G���[�����p (��ŏ���) - */ - public IDAddressedEntity createObject(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, - Angle angle, Attribute attribute, ObjectModel model) { - String id = RandomStringGenerator.generateUniqueString(Object.UNIQUE_ID_LENGTH, - RandomStringGenerator.ALPHA_NUMERIC, objMap.keySet()); - Object object = new Object(position, velocity, angularVelocity, angle, attribute, ""); - objMap.put(id, object); - return new IDAddressedEntity(id, object); - } public IDAddressedEntity createCharacter(String instanceId, String accountURI, String name, Position3D position, Angle angle, String model) { diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index fa70f8c..2ce7105 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -144,7 +144,7 @@ this.emoteState.setEmoteType(animationClassToStart); } - public void destroyPlayer() { + public void destroy() { writeCharacterData(characterURI); } diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index 4d3bc6d..78afed7 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -103,6 +103,8 @@ } public Player destroyPlayer(String playerId) { + Player player = playerMap.get(playerId); + player.destroy(); return playerMap.remove(playerId); } }