mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-10-18 12:04:46 +00:00
Merge remote-tracking branch 'origin/stable'
# Conflicts: # composer.json # composer.lock # resources/vanilla # src/CrashDump.php # src/PocketMine.php # src/pocketmine/Server.php # src/pocketmine/item/Bucket.php # src/pocketmine/item/Item.php # src/pocketmine/level/format/Chunk.php # src/pocketmine/level/format/io/leveldb/LevelDB.php # src/pocketmine/level/format/io/region/McRegion.php # src/pocketmine/network/mcpe/protocol/BatchPacket.php # src/pocketmine/tile/Furnace.php # src/pocketmine/utils/UUID.php # src/utils/ServerKiller.php
This commit is contained in:
@@ -28,6 +28,7 @@ use pocketmine\errorhandler\ErrorTypeToStringMap;
|
||||
use pocketmine\network\mcpe\protocol\ProtocolInfo;
|
||||
use pocketmine\plugin\PluginBase;
|
||||
use pocketmine\plugin\PluginManager;
|
||||
use pocketmine\utils\AssumptionFailedError;
|
||||
use pocketmine\utils\Filesystem;
|
||||
use pocketmine\utils\Utils;
|
||||
use function base64_encode;
|
||||
@@ -149,7 +150,8 @@ class CrashDump{
|
||||
if($json === false){
|
||||
throw new \RuntimeException("Failed to encode crashdump JSON: " . json_last_error_msg());
|
||||
}
|
||||
$this->encodedData = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
|
||||
$zlibEncoded = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
|
||||
if($zlibEncoded === false) throw new AssumptionFailedError("ZLIB compression failed");
|
||||
foreach(str_split(base64_encode($this->encodedData), 76) as $line){
|
||||
$this->addLine($line);
|
||||
}
|
||||
|
Reference in New Issue
Block a user