Merge commit '9eebfa7cc30c8a5ac39f192c79023131623ad4b4'

# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/pocketmine/Achievement.php

src/CrashDump.php

@@ -127,6 +127,9 @@ class CrashDump{
 		return $this->encodedData;
 	}
 
+	/**
+	 * @return mixed[]
+	 */
 	public function getData() : array{
 		return $this->data;
 	}

src/Server.php

@@ -1416,7 +1416,7 @@ class Server{
 	}
 
 	/**
-	 * @param array|null $trace
+	 * @param mixed[][]|null $trace
 	 */
 	public function exceptionHandler(\Throwable $e, $trace = null) : void{
 		while(@ob_end_flush()){}