Merge commit '9eebfa7cc30c8a5ac39f192c79023131623ad4b4'

# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/pocketmine/Achievement.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 20:07:21 +00:00
2 changed files with 4 additions and 1 deletions

View File

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