diff --git a/src/API/LevelAPI.php b/src/API/LevelAPI.php index 3784363a..70a892a2 100644 --- a/src/API/LevelAPI.php +++ b/src/API/LevelAPI.php @@ -225,19 +225,6 @@ class LevelAPI{ return false; } console("[INFO] Unloading level \"" . $name . "\""); - $level->nextSave = PHP_INT_MAX; - $level->save(); - foreach($this->server->api->player->getAll($level) as $player){ - $player->teleport($this->server->spawn); - } - foreach($this->server->api->entity->getAll($level) as $entity){ - if($entity->class !== ENTITY_PLAYER){ - $entity->close(); - } - } - foreach($this->server->api->tile->getAll($level) as $tile){ - $tile->close(); - } $level->close(); unset($this->levels[$name]); return true; diff --git a/src/world/Level.php b/src/world/Level.php index 2f805f98..cd677076 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -72,9 +72,20 @@ class Level{ public function close(){ if(isset($this->level)){ $this->save(true, true, true, true); + $this->server->api->block->removeAllBlockUpdates($this); + foreach($this->server->api->player->getAll($this) as $player){ + $player->teleport($this->server->spawn); + } + foreach($this->entityList as $entity){ + if($entity->class !== ENTITY_PLAYER){ + $entity->close(); + } + } + foreach($this->server->api->tile->getAll($this) as $tile){ + $tile->close(); + } $this->level->close(); unset($this->level); - $this->server->api->block->removeAllBlockUpdates($this); } unset($this->mobSpawner->level); }