Fix #157

Author: dries-c

PMUtils.php

@@ -7,9 +7,9 @@
 use pocketmine\network\mcpe\EntityEventBroadcaster;
 use pocketmine\network\mcpe\PacketBroadcaster;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
-use pocketmine\network\mcpe\raklib\RakLibInterface;
+use pocketmine\network\mcpe\StandardEntityEventBroadcaster;
+use pocketmine\network\mcpe\StandardPacketBroadcaster;
 use pocketmine\Server;
-use ReflectionClass;
 use function method_exists;
 
 class PMUtils
@@ -20,48 +20,15 @@ public static function getPacketBroadcaster(Server $server): PacketBroadcaster
             return $server->getPacketBroadcaster(ProtocolInfo::CURRENT_PROTOCOL);
         }
 
-        $packetBroadcaster = self::getRaklibInterfacePropertyValue($server, 'packetBroadcaster');
-        if ($packetBroadcaster instanceof PacketBroadcaster) {
-            return $packetBroadcaster;
-        }
-
-        throw new Exception("PacketBroadcaster isn't valid");
+        return new StandardPacketBroadcaster($server, ProtocolInfo::CURRENT_PROTOCOL);
     }
 
-    public static function getEntityEventBroadcaster(Server $server): EntityEventBroadcaster
+    public static function getEntityEventBroadcaster(Server $server, PacketBroadcaster $packetBroadcaster): EntityEventBroadcaster
     {
         if (method_exists($server, 'getEntityEventBroadcaster')) {
-            return $server->getEntityEventBroadcaster(self::getPacketBroadcaster($server), TypeConverter::getInstance());
-        }
-
-        $entityEventBroadcaster = self::getRaklibInterfacePropertyValue($server, 'entityEventBroadcaster');
-        if ($entityEventBroadcaster instanceof EntityEventBroadcaster) {
-            return $entityEventBroadcaster;
-        }
-
-        throw new Exception("EntityEventBroadcaster isn't valid");
-    }
-
-    private static function getRaklibInterfacePropertyValue(Server $server, string $propertyName): mixed
-    {
-        $interface = self::getRaklibInterface($server);
-        $reflection = new ReflectionClass($interface);
-        $property = $reflection->getProperty($propertyName);
-
-        return $property->getValue($interface);
-    }
-
-    /**
-     * @throws Exception
-     */
-    private static function getRaklibInterface(Server $server): RakLibInterface
-    {
-        foreach ($server->getNetwork()->getInterfaces() as $interface) {
-            if ($interface instanceof RakLibInterface) {
-                return $interface;
-            }
+            return $server->getEntityEventBroadcaster($packetBroadcaster, TypeConverter::getInstance());
         }
 
-        throw new Exception("Raklib interface hasn't been registered");
+        return new StandardEntityEventBroadcaster($packetBroadcaster, TypeConverter::getInstance());
     }
 }

ProxyNetworkInterface.php

@@ -130,7 +130,7 @@ public function __construct(PluginBase $plugin, int $port, ?string $composerPath
         $this->threadToMainReader = new PthreadsChannelReader($threadToMainBuffer);
 
         $this->packetBroadcaster = PMUtils::getPacketBroadcaster($server);
-        $this->entityEventBroadcaster = PMUtils::getEntityEventBroadcaster($server);
+        $this->entityEventBroadcaster = PMUtils::getEntityEventBroadcaster($server, $this->packetBroadcaster);
 
         PacketPool::getInstance()->registerPacket(new TickSyncPacket());