Remove PacketSerializerContext

Author: dries-c

PMUtils.php

@@ -6,32 +6,18 @@
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\EntityEventBroadcaster;
 use pocketmine\network\mcpe\PacketBroadcaster;
-use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\raklib\RakLibInterface;
 use pocketmine\Server;
 use ReflectionClass;
 use function method_exists;
 
 class PMUtils
 {
-    public static function getPacketSerializerContext(Server $server): PacketSerializerContext
-    {
-        if (method_exists($server, 'getPacketSerializerContext')) {
-            return $server->getPacketSerializerContext(TypeConverter::getInstance());
-        }
-
-        $packetSerializerContext = self::getRaklibInterfacePropertyValue($server, 'packetSerializerContext');
-        if ($packetSerializerContext instanceof PacketSerializerContext) {
-            return $packetSerializerContext;
-        }
-
-        throw new Exception("PacketSerializerContext isn't valid");
-    }
-
     public static function getPacketBroadcaster(Server $server): PacketBroadcaster
     {
         if (method_exists($server, 'getPacketBroadcaster')) {
-            return $server->getPacketBroadcaster(self::getPacketSerializerContext($server));
+            return $server->getPacketBroadcaster(ProtocolInfo::CURRENT_PROTOCOL);
         }
 
         $packetBroadcaster = self::getRaklibInterfacePropertyValue($server, 'packetBroadcaster');

ProxyNetworkInterface.php

@@ -27,7 +27,6 @@
 use pocketmine\network\mcpe\protocol\PacketDecodeException;
 use pocketmine\network\mcpe\protocol\PacketPool;
 use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
-use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
 use pocketmine\network\mcpe\protocol\types\CompressionAlgorithm;
 use pocketmine\network\mcpe\raklib\PthreadsChannelReader;
 use pocketmine\network\mcpe\raklib\PthreadsChannelWriter;
@@ -81,8 +80,6 @@ final class ProxyNetworkInterface implements NetworkInterface
     /** @var PthreadsChannelReader */
     private PthreadsChannelReader $threadToMainReader;
 
-    /** @var PacketSerializerContext */
-    private PacketSerializerContext $packetSerializerContext;
     /** @var PacketBroadcaster */
     private PacketBroadcaster $packetBroadcaster;
     /** @var EntityEventBroadcaster */
@@ -140,7 +137,6 @@ public function __construct(PluginBase $plugin, int $port, ?string $composerPath
         $this->mainToThreadWriter = new PthreadsChannelWriter($mainToThreadBuffer);
         $this->threadToMainReader = new PthreadsChannelReader($threadToMainBuffer);
 
-        $this->packetSerializerContext = PMUtils::getPacketSerializerContext($server);
         $this->packetBroadcaster = PMUtils::getPacketBroadcaster($server);
         $this->entityEventBroadcaster = PMUtils::getEntityEventBroadcaster($server);
 
@@ -366,7 +362,6 @@ public function createSession(int $socketId, string $ip, int $port): NetworkSess
             $this->server,
             $this->server->getNetwork()->getSessionManager(),
             PacketPool::getInstance(),
-            $this->packetSerializerContext,
             new ProxyPacketSender($socketId, $this),
             $this->packetBroadcaster,
             $this->entityEventBroadcaster,