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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/utils/Utils.php
This commit is contained in:
Dylan K. Taylor 2020-12-09 20:27:19 +00:00
commit ff6672ba85
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/Filesystem.php
View File

@ -96,7 +96,7 @@ final class Filesystem{
foreach($cleanPaths as $cleanPath => $replacement){ foreach($cleanPaths as $cleanPath => $replacement){
$cleanPath = rtrim(str_replace([DIRECTORY_SEPARATOR, "phar://"], ["/", ""], $cleanPath), "/"); $cleanPath = rtrim(str_replace([DIRECTORY_SEPARATOR, "phar://"], ["/", ""], $cleanPath), "/");
if(strpos($result, $cleanPath) === 0){ if(strpos($result, $cleanPath) === 0){
$result = ltrim(str_replace($cleanPath, "[$replacement]", $result), "/"); $result = ltrim(str_replace($cleanPath, $replacement, $result), "/");
} }
} }
return $result; return $result;