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

Merge branch 'master' into mcpe-1.1

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-05-18 11:29:52 +01:00
parent fe8cb8cd86 568e2760f1
commit 85c1535c75
6 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/PocketMine.php
View File

@ -234,7 +234,6 @@ namespace pocketmine {
}
return parse_offset($offset);
break;
case 'linux':
// Ubuntu / Debian.
if(file_exists('/etc/timezone')){
@ -261,7 +260,6 @@ namespace pocketmine {
}
return parse_offset($offset);
break;
case 'mac':
if(is_link('/etc/localtime')){
$filename = readlink('/etc/localtime');
@ -272,10 +270,8 @@ namespace pocketmine {
}
return false;
break;
default:
return false;
break;
}
}