Merge branch 'master' into api3/network

This commit is contained in:
Dylan K. Taylor
2017-03-25 21:26:46 +00:00
20 changed files with 128 additions and 46 deletions

View File

@ -357,7 +357,7 @@ namespace pocketmine {
return -1;
}
function getTrace($start = 1, $trace = null){
function getTrace($start = 0, $trace = null){
if($trace === null){
if(function_exists("xdebug_get_function_stack")){
$trace = array_reverse(xdebug_get_function_stack());