mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-22 19:06:35 +00:00
Code Issues Projects Releases Wiki Activity

world providers: don't assume that getPath() has a trailing directory separator

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-08-25 15:45:40 +01:00
parent aa006cca0e
commit 42ffc45c1c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/world/format/io/leveldb/LevelDB.php
View File

@ -63,6 +63,7 @@ use function strlen;
use function substr; use function substr;
use function trim; use function trim;
use function unpack; use function unpack;
use const DIRECTORY_SEPARATOR;
use const LEVELDB_ZLIB_RAW_COMPRESSION; use const LEVELDB_ZLIB_RAW_COMPRESSION;
class LevelDB extends BaseWorldProvider implements WritableWorldProvider{ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
@ -132,7 +133,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
} }
protected function loadLevelData() : WorldData{ protected function loadLevelData() : WorldData{
return new BedrockWorldData($this->getPath() . "level.dat"); return new BedrockWorldData($this->getPath() . DIRECTORY_SEPARATOR . "level.dat");
} }
public function getWorldHeight() : int{ public function getWorldHeight() : int{

3
src/world/format/io/region/RegionWorldProvider.php
View File

@ -41,6 +41,7 @@ use function scandir;
use function strrpos; use function strrpos;
use function substr; use function substr;
use function time; use function time;
use const DIRECTORY_SEPARATOR;
use const SCANDIR_SORT_NONE; use const SCANDIR_SORT_NONE;
abstract class RegionWorldProvider extends BaseWorldProvider{ abstract class RegionWorldProvider extends BaseWorldProvider{
@ -87,7 +88,7 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
protected $regions = []; protected $regions = [];
protected function loadLevelData() : WorldData{ protected function loadLevelData() : WorldData{
return new JavaWorldData($this->getPath() . "level.dat"); return new JavaWorldData($this->getPath() . DIRECTORY_SEPARATOR . "level.dat");
} }
public function doGarbageCollection() : void{ public function doGarbageCollection() : void{