diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 09084ddb1..600eec22d 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -112,7 +112,6 @@ use function array_sum; use function asort; use function assert; use function base64_encode; -use function bin2hex; use function class_exists; use function count; use function define; @@ -2528,7 +2527,7 @@ class Server{ if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){ $this->queryHandler->handle($interface, $address, $port, $payload); }else{ - $this->logger->debug("Unhandled raw packet from $address $port: " . bin2hex($payload)); + $this->logger->debug("Unhandled raw packet from $address $port: " . base64_encode($payload)); } }catch(\Throwable $e){ $this->logger->logException($e); diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index 547785c56..5b4ae890a 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -46,7 +46,6 @@ use pocketmine\utils\Binary; use function array_map; use function base64_decode; use function base64_encode; -use function bin2hex; use function file_get_contents; use function get_class; use function hex2bin; @@ -874,7 +873,7 @@ class Item implements ItemIds, \JsonSerializable{ * @return string */ final public function __toString() : string{ - return "Item " . $this->name . " (" . $this->id . ":" . ($this->hasAnyDamageValue() ? "?" : $this->meta) . ")x" . $this->count . ($this->hasCompoundTag() ? " tags:0x" . bin2hex($this->getCompoundTag()) : ""); + return "Item " . $this->name . " (" . $this->id . ":" . ($this->hasAnyDamageValue() ? "?" : $this->meta) . ")x" . $this->count . ($this->hasCompoundTag() ? " tags:" . base64_encode($this->getCompoundTag()) : ""); } /** diff --git a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php index f9d8ece15..53afe17be 100644 --- a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php +++ b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php @@ -68,6 +68,7 @@ use pocketmine\network\mcpe\protocol\TextPacket; use pocketmine\Player; use pocketmine\Server; use pocketmine\timings\Timings; +use function base64_encode; use function bin2hex; use function implode; use function json_decode; @@ -107,7 +108,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{ $ev = new DataPacketReceiveEvent($this->player, $packet); $ev->call(); if(!$ev->isCancelled() and !$packet->handle($this)){ - $this->server->getLogger()->debug("Unhandled " . $packet->getName() . " received from " . $this->player->getName() . ": 0x" . bin2hex($packet->buffer)); + $this->server->getLogger()->debug("Unhandled " . $packet->getName() . " received from " . $this->player->getName() . ": " . base64_encode($packet->buffer)); } $timings->stopTiming(); diff --git a/src/pocketmine/network/mcpe/RakLibInterface.php b/src/pocketmine/network/mcpe/RakLibInterface.php index 9bffb4338..1877b0a13 100644 --- a/src/pocketmine/network/mcpe/RakLibInterface.php +++ b/src/pocketmine/network/mcpe/RakLibInterface.php @@ -40,7 +40,7 @@ use raklib\server\ServerHandler; use raklib\server\ServerInstance; use raklib\utils\InternetAddress; use function addcslashes; -use function bin2hex; +use function base64_encode; use function get_class; use function implode; use function rtrim; @@ -170,7 +170,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{ } }catch(\Throwable $e){ $logger = $this->server->getLogger(); - $logger->debug("Packet " . (isset($pk) ? get_class($pk) : "unknown") . " 0x" . bin2hex($packet->buffer)); + $logger->debug("Packet " . (isset($pk) ? get_class($pk) : "unknown") . ": " . base64_encode($packet->buffer)); $logger->logException($e); $player->close($player->getLeaveMessage(), "Internal server error"); diff --git a/src/pocketmine/network/query/QueryHandler.php b/src/pocketmine/network/query/QueryHandler.php index 7dfb7c46a..2788d7907 100644 --- a/src/pocketmine/network/query/QueryHandler.php +++ b/src/pocketmine/network/query/QueryHandler.php @@ -30,7 +30,7 @@ namespace pocketmine\network\query; use pocketmine\network\AdvancedSourceInterface; use pocketmine\Server; use pocketmine\utils\Binary; -use function bin2hex; +use function base64_encode; use function chr; use function hash; use function microtime; @@ -134,7 +134,7 @@ class QueryHandler{ $interface->sendRawPacket($address, $port, $reply); break; default: - $this->debug("Unhandled packet from $address $port: 0x" . bin2hex($packet)); + $this->debug("Unhandled packet from $address $port: " . base64_encode($packet)); break; } }