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

Fixed DevTools plugin related issues

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-03-05 13:26:10 +01:00
parent 8c32b3d896
commit 3b2a7e68f3
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PocketMinecraftServer.php
View File

@ -41,8 +41,8 @@ class PocketMinecraftServer{
if($this->port < 19132 or $this->port > 19135){ if($this->port < 19132 or $this->port > 19135){
console("[WARNING] You've selected a not-standard port. Normal port range is from 19132 to 19135 included"); console("[WARNING] You've selected a not-standard port. Normal port range is from 19132 to 19135 included");
} }
$this->serverID = $this->serverID === false ? Utils::readLong(Utils::getRandomBytes(8)):$this->serverID; $this->serverID = $this->serverID === false ? Utils::readLong(Utils::getRandomBytes(8, false)):$this->serverID;
$this->seed = $this->seed === false ? Utils::readInt(Utils::getRandomBytes(4)):$this->seed; $this->seed = $this->seed === false ? Utils::readInt(Utils::getRandomBytes(4, false)):$this->seed;
console("[INFO] Loading database..."); console("[INFO] Loading database...");
$this->startDatabase(); $this->startDatabase();
$this->doTick = false; $this->doTick = false;

7
src/config.php
View File

@ -32,8 +32,13 @@ error_reporting(E_ALL ^ E_NOTICE);
ini_set("allow_url_fopen", 1); ini_set("allow_url_fopen", 1);
ini_set("display_errors", 1); ini_set("display_errors", 1);
ini_set('default_charset', 'utf-8'); ini_set('default_charset', 'utf-8');
define("FILE_PATH", realpath(dirname(__FILE__)."/../")."/"); if(defined("POCKETMINE_COMPILE") and POCKETMINE_COMPILE === true){
define("FILE_PATH", realpath(dirname(__FILE__))."/");
}else{
define("FILE_PATH", realpath(dirname(__FILE__)."/../")."/");
}
set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH); set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH);
ini_set("memory_limit", "256M"); //Default ini_set("memory_limit", "256M"); //Default
define("LOG", true); define("LOG", true);
define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78"); define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78");

1
src/functions.php
View File

@ -207,7 +207,6 @@ function console($message, $EOL = true, $log = true, $level = 1){
} }
function fatal_handler($errno, $errstr, $errfile, $errline){ function fatal_handler($errno, $errstr, $errfile, $errline){
global $lasttrace;
console("[ERROR] A level ".$errno." error happened: \"$errstr\" in \"$errfile\" at line $errline", true, true, 0); console("[ERROR] A level ".$errno." error happened: \"$errstr\" in \"$errfile\" at line $errline", true, true, 0);
return false; return false;
} }

2
src/utils/Utils.php
View File

@ -252,7 +252,7 @@ class Utils extends Thread{
//some entropy, but works ^^ //some entropy, but works ^^
$weakEntropy = array( $weakEntropy = array(
is_array($startEntropy) ? implode($startEntropy):$startEntropy, is_array($startEntropy) ? implode($startEntropy):$startEntropy,
serialize(stat(__FILE__)), serialize(@stat(__FILE__)),
__DIR__, __DIR__,
PHP_OS, PHP_OS,
microtime(), microtime(),