fix account manager method

MillhioreBT · Apr 6, 2024 · 5cdbab8 · 5cdbab8
1 parent 62f8a2b
commit 5cdbab8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/player.cpp b/src/player.cpp
@@ -2074,6 +2074,11 @@ void Player::addInFightTicks(bool pzlock /*= false*/)
 	addCondition(condition);
 }
 
+bool Player::isAccountManager() const
+{
+	return g_config[ConfigKeysBoolean::ACCOUNT_MANAGER] && guid == ACCOUNT_MANAGER_PLAYER_ID;
+}
+
 void Player::removeList()
 {
 	g_game.removePlayer(this);

diff --git a/src/player.h b/src/player.h
@@ -137,7 +137,7 @@ class Player final : public Creature, public Cylinder
 
 	void setGUID(uint32_t guid) { this->guid = guid; }
 	uint32_t getGUID() const { return guid; }
-	bool isAccountManager() const { return guid == ACCOUNT_MANAGER_PLAYER_ID; }
+	bool isAccountManager() const;
 	bool canSeeInvisibility() const override { return hasFlag(PlayerFlag_CanSenseInvisibility) || group->access; }
 
 	void removeList() override;

diff --git a/src/protocollogin.cpp b/src/protocollogin.cpp
@@ -143,14 +143,13 @@ void ProtocolLogin::onRecvFirstMessage(NetworkMessage& msg)
 		return;
 	}
 
-	const auto& accountManager = g_config[ConfigKeysBoolean::ACCOUNT_MANAGER];
 	auto accountName = msg.getString();
 	auto password = msg.getString();
 
 	const bool accountNameEmpty = accountName.empty();
 	const bool passwordEmpty = password.empty();
 
-	if (accountManager && accountNameEmpty && passwordEmpty) {
+	if (g_config[ConfigKeysBoolean::ACCOUNT_MANAGER] && accountNameEmpty && passwordEmpty) {
 		g_dispatcher.addTask([=, thisPtr = std::static_pointer_cast<ProtocolLogin>(shared_from_this())]() {
 			thisPtr->getCharacterList(ACCOUNT_MANAGER_ACCOUNT_NAME, ACCOUNT_MANAGER_ACCOUNT_PASSWORD);
 		});