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

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-24 19:26:52 +01:00
commit 5433a3f964
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/PocketMine.php
View File

@ -144,6 +144,12 @@ namespace pocketmine {
exit(1); exit(1);
} }
if(version_compare(RakLib::VERSION, "0.8.1") < 0){
echo "[CRITICAL] RakLib version 0.8.1 is required, while you have version " . RakLib::VERSION . "." . PHP_EOL;
echo "[CRITICAL] Please update your submodules or use provided builds." . PHP_EOL;
exit(1);
}
set_time_limit(0); //Who set it to 30 seconds?!?! set_time_limit(0); //Who set it to 30 seconds?!?!
ini_set("allow_url_fopen", '1'); ini_set("allow_url_fopen", '1');

3
src/pocketmine/utils/UUID.php
View File

@ -94,9 +94,6 @@ class UUID{
$hex = bin2hex($this->toBinary()); $hex = bin2hex($this->toBinary());
//xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx 8-4-4-4-12 //xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx 8-4-4-4-12
if($this->version !== null){
return substr($hex, 0, 8) . "-" . substr($hex, 8, 4) . "-" . hexdec($this->version) . substr($hex, 13, 3) . "-8" . substr($hex, 17, 3) . "-" . substr($hex, 20, 12);
}
return substr($hex, 0, 8) . "-" . substr($hex, 8, 4) . "-" . substr($hex, 12, 4) . "-" . substr($hex, 16, 4) . "-" . substr($hex, 20, 12); return substr($hex, 0, 8) . "-" . substr($hex, 8, 4) . "-" . substr($hex, 12, 4) . "-" . substr($hex, 16, 4) . "-" . substr($hex, 20, 12);
} }

2
src/raklib

@ -1 +1 @@
Subproject commit 3b1ca9c1bedf1a18ef40757665bf8c9e7e769c9c Subproject commit 1fee79e4aac0f958ab720606e223b0aa690f5c47