From 1adf53a81ea8e5ddb6f7fd364b7fe3c4e2ef8a38 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Wed, 15 Oct 2014 17:58:03 +0200
Subject: [PATCH] Fixed error_handler trace generation on higher debug levels

---
 src/pocketmine/PocketMine.php | 4 ++--
 src/pocketmine/Server.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
index 7fae18e1e..9fd4d41fb 100644
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@@ -327,9 +327,9 @@ namespace pocketmine {
 		return rtrim(str_replace(["\\", ".php", "phar://", rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), "/"), rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH), "/")], ["/", "", "", "", ""], $path), "/");
 	}
 
-	function error_handler($errno, $errstr, $errfile, $errline, $trace = null){
+	function error_handler($errno, $errstr, $errfile, $errline, $context, $trace = null){
 		global $lastError;
-		if(error_reporting() === 0){ //@ error-control
+		if(error_reporting() === 0){ //@ error-con..trol
 			return false;
 		}
 		$errorConversion = [
diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index f8cc822a7..21c49ad22 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -1932,7 +1932,7 @@ class Server{
 			return;
 		}
 
-		error_handler(E_ERROR, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTrace());
+		error_handler(E_ERROR, $e->getMessage(), $e->getFile(), $e->getLine(), [], $e->getTrace());
 		global $lastExceptionError, $lastError;
 		$lastExceptionError = $lastError;
 		$this->crashDump();