diff --git a/src/network/mcpe/handler/LoginPacketHandler.php b/src/network/mcpe/handler/LoginPacketHandler.php index c2367454b..cbeff1598 100644 --- a/src/network/mcpe/handler/LoginPacketHandler.php +++ b/src/network/mcpe/handler/LoginPacketHandler.php @@ -64,18 +64,6 @@ class LoginPacketHandler extends PacketHandler{ ){} public function handleLogin(LoginPacket $packet) : bool{ - if(!$this->isCompatibleProtocol($packet->protocol)){ - $this->session->sendDataPacket(PlayStatusPacket::create($packet->protocol < ProtocolInfo::CURRENT_PROTOCOL ? PlayStatusPacket::LOGIN_FAILED_CLIENT : PlayStatusPacket::LOGIN_FAILED_SERVER), true); - - //This pocketmine disconnect message will only be seen by the console (PlayStatusPacket causes the messages to be shown for the client) - $this->session->disconnect( - $this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_disconnect_incompatibleProtocol((string) $packet->protocol)), - false - ); - - return true; - } - $extraData = $this->fetchAuthData($packet->chainDataJwt); if(!Player::isValidUserName($extraData->displayName)){ @@ -237,8 +225,4 @@ class LoginPacketHandler extends PacketHandler{ $this->server->getAsyncPool()->submitTask(new ProcessLoginTask($packet->chainDataJwt->chain, $packet->clientDataJwt, $authRequired, $this->authCallback)); $this->session->setHandler(null); //drop packets received during login verification } - - protected function isCompatibleProtocol(int $protocolVersion) : bool{ - return $protocolVersion === ProtocolInfo::CURRENT_PROTOCOL; - } } diff --git a/src/network/mcpe/handler/SessionStartPacketHandler.php b/src/network/mcpe/handler/SessionStartPacketHandler.php index 687422de2..5625869f1 100644 --- a/src/network/mcpe/handler/SessionStartPacketHandler.php +++ b/src/network/mcpe/handler/SessionStartPacketHandler.php @@ -71,6 +71,9 @@ final class SessionStartPacketHandler extends PacketHandler{ } protected function isCompatibleProtocol(int $protocolVersion) : bool{ - return $protocolVersion === ProtocolInfo::CURRENT_PROTOCOL; + //TODO: REMOVE THIS + //1.19.63 released with an unchanged protocol, but a bumped protocol version, since they forgot to do it in the + //previous release. Since they are functionally identical, we can accept both. + return $protocolVersion === ProtocolInfo::CURRENT_PROTOCOL || $protocolVersion === 568; } }