mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-19 23:37:45 +00:00
Code Issues Projects Releases Wiki Activity

Start using webmozart/pathutil for joining paths (#4287)

Browse Source
This commit is contained in:
Dylan T
2021-06-29 19:40:43 +01:00
committed by GitHub
parent aee7b03c1d
commit 32d7b1e6af
31 changed files with 252 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/world/format/io/FormatConverter.php
View File

@@ -27,6 +27,7 @@ use pocketmine\utils\Filesystem;
use pocketmine\utils\Utils;
use pocketmine\world\generator\GeneratorManager;
use pocketmine\world\WorldCreationOptions;
use Webmozart\PathUtil\Path;
use function basename;
use function crc32;
use function file_exists;
@@ -71,7 +72,7 @@ class FormatConverter{
}
$nextSuffix = "";
do{
$this->backupPath = $backupPath . DIRECTORY_SEPARATOR . basename($this->oldProvider->getPath()) . $nextSuffix;
$this->backupPath = Path::join($backupPath, basename($this->oldProvider->getPath()) . $nextSuffix);
$nextSuffix = "_" . crc32(random_bytes(4));
}while(file_exists($this->backupPath));
}