diff --git a/src/world/LevelImport.php b/src/world/LevelImport.php index ecad737d..08341a76 100644 --- a/src/world/LevelImport.php +++ b/src/world/LevelImport.php @@ -86,13 +86,13 @@ class LevelImport{ } $chunks->map = null; $chunks = null; - @unlink($this->path . "level.dat"); - @unlink($this->path . "level.dat_old"); - @unlink($this->path . "player.dat"); - @unlink($this->path . "entities.dat"); - @unlink($this->path . "chunks.dat"); - @unlink($this->path . "chunks.dat.gz"); - @unlink($this->path . "tiles.dat"); + if(file_exists$this->path . "level.dat") @unlink($this->path . "level.dat"); + if(file_exists$this->path . "level.dat_old") @unlink($this->path . "level.dat_old"); + if(file_exists$this->path . "player.dat") @unlink($this->path . "player.dat"); + if(file_exists$this->path . "entities.dat") @unlink($this->path . "entities.dat"); + if(file_exists$this->path . "chunks.dat") @unlink($this->path . "chunks.dat"); + if(file_exists$this->path . "chunks.dat.gz") @unlink($this->path . "chunks.dat.gz"); + if(file_exists$this->path . "tiles.dat") @unlink($this->path . "tiles.dat"); unset($chunks, $level, $entities, $tiles, $nbt); return true; } diff --git a/src/world/MobSpawner.php b/src/world/MobSpawner.php index 19e666c4..bdb878b4 100644 --- a/src/world/MobSpawner.php +++ b/src/world/MobSpawner.php @@ -26,12 +26,12 @@ class MobSpawner{ } public function spawnMobs(){ - - if(self::$spawnAnimals && $this->level->isDay()){ //Animal + $phase = $this->server->api->time->getPhase($this->level); + if(self::$spawnAnimals && $phase == "day"){ //Animal $type = mt_rand(10, 13); $baby = false; //TODO baby $grassOnly = true; - }elseif(self::$spawnMobs && $this->level->isNight()){ //Monster + }elseif(self::$spawnMobs && $phase == "night"){ //Monster, true night $type = mt_rand(32, 35); $grassOnly = false; $baby = 2;