diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index baff8ad..67c333e 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -190,6 +190,8 @@ public void destroy() { writeCharacterData(); + Instance instance = Instances.getInstance().getInstance(instanceID); + instance.getUniverse().displace(this.getPlaceable()); } private Character getCharacter() { diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index 71e0146..ee2b9ee 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -125,8 +125,6 @@ return null; } player.destroy(); - Instance instance = Instances.getInstance().getInstance(player.getInstanceID()); - instance.getUniverse().displace(player.getPlaceable()); return playerMap.remove(playerId); } } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 2e2add6..9d28ca7 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -132,8 +132,6 @@ if (currentTime > (lastUpdateTime + Player.STOP_TIME_LIMIT)) { System.out.println("delete started (playerId: " + playerId + ")"); player.destroy(); - Instance instance = Instances.getInstance().getInstance(player.getInstanceID()); - instance.getUniverse().displace(player.getPlaceable()); it.remove(); System.out.println("delete finished (playerId: " + playerId + ")"); }