fix: block re-login with different protocols (#1877)

Resolves #1668
opentibiabr · Nov 22, 2023 · ac056e7 · ac056e7
1 parent 8e2f213
commit ac056e7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp
@@ -344,6 +344,10 @@ class Player final : public Creature, public Cylinder, public Bankable {
 		operatingSystem = clientos;
 	}
 
+	bool isOldProtocol() {
+		return client && client->oldProtocol;
+	}
+
 	uint32_t getProtocolVersion() const {
 		if (!client) {
 			return 0;

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -469,6 +469,8 @@ void ProtocolGame::login(const std::string &name, uint32_t accountId, OperatingS
 		writeToOutputBuffer(opcodeMessage);
 	}
 
+	g_logger().debug("Player logging in in version '{}' and oldProtocol '{}'", getVersion(), oldProtocol);
+
 	// dispatcher thread
 	std::shared_ptr<Player> foundPlayer = g_game().getPlayerUniqueLogin(name);
 	if (!foundPlayer) {
@@ -734,6 +736,11 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) {
 
 	std::shared_ptr<Player> foundPlayer = g_game().getPlayerUniqueLogin(characterName);
 	if (foundPlayer && foundPlayer->client) {
+		if (foundPlayer->getProtocolVersion() != getVersion() && foundPlayer->isOldProtocol() != oldProtocol) {
+			disconnectClient(fmt::format("You are already logged in using protocol '{}'. Please log out from the other session to connect here.", foundPlayer->getProtocolVersion()));
+			return;
+		}
+
 		foundPlayer->client->disconnectClient("You are already connected through another client. Please use only one client at a time!");
 	}