Fix logout message connection lost on bed and offline training and re…

…move unused tag on druid familiar (#221) Fixes connection lost message when using an bed or offline training statues, added a check to identify when a player was "forced" removed
opentibiabr · Mar 11, 2022 · e6abcc8 · e6abcc8
1 parent 1527549
commit e6abcc8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/data/monster/familiars/druid_familiar.lua b/data/monster/familiars/druid_familiar.lua
@@ -19,7 +19,6 @@ monster.race = "undead"
 monster.corpse = 0
 monster.speed = 309
 monster.manaCost = 3000
-monster.maxSummons = 0
 
 monster.changeTarget = {
 	interval = 4000,

diff --git a/data/scripts/actions/other/skill_trainer.lua b/data/scripts/actions/other/skill_trainer.lua
@@ -20,7 +20,7 @@ function skillTrainer.onUse(player, item, fromPosition, target, toPosition, isHo
 	end
 
 	player:setOfflineTrainingSkill(skill)
-	player:remove()
+	player:remove(false)
 	return true
 end
 

diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -1955,7 +1955,7 @@ void Player::onThink(uint32_t interval)
 		idleTime += interval;
 		const int32_t kickAfterMinutes = g_configManager().getNumber(KICK_AFTER_MINUTES);
 		if (idleTime > (kickAfterMinutes * 60000) + 60000) {
-			kickPlayer(true);
+			removePlayer(true);
 		} else if (client && idleTime == 60000 * kickAfterMinutes) {
 			std::ostringstream ss;
 			ss << "There was no variation in your behaviour for " << kickAfterMinutes << " minutes. You will be disconnected in one minute if there is no change in your actions until then.";
@@ -2696,11 +2696,11 @@ void Player::addList()
 	g_game.addPlayer(this);
 }
 
-void Player::kickPlayer(bool displayEffect)
+void Player::removePlayer(bool displayEffect, bool forced /*= true*/)
 {
 	g_creatureEvents->playerLogout(this);
 	if (client) {
-		client->logout(displayEffect, true);
+		client->logout(displayEffect, forced);
 	} else {
 		g_game.removeCreature(this);
 	}
@@ -4187,7 +4187,7 @@ void Player::onPlacedCreature()
 {
 	//scripting event - onLogin
 	if (!g_creatureEvents->playerLogin(this)) {
-		kickPlayer(true);
+		removePlayer(true);
 	}
 
 	sendUnjustifiedPoints();

diff --git a/src/creatures/players/player.h b/src/creatures/players/player.h
@@ -158,7 +158,7 @@ class Player final : public Creature, public Cylinder
 
 		void removeList() override;
 		void addList() override;
-		void kickPlayer(bool displayEffect);
+		void removePlayer(bool displayEffect, bool forced = true);
 
 		static uint64_t getExpForLevel(int32_t lv) {
 			lv--;
@@ -2202,6 +2202,7 @@ class Player final : public Creature, public Cylinder
 		friend class IOLoginData;
 		friend class ProtocolGame;
 		friend class MoveEvent;
+		friend class BedItem;
 
   account::Account *account_;
 };

diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -312,7 +312,7 @@ void Game::setGameState(GameState_t newState)
 			//kick all players that are still online
 			auto it = players.begin();
 			while (it != players.end()) {
-				it->second->kickPlayer(true);
+				it->second->removePlayer(true);
 				it = players.begin();
 			}
 
@@ -333,7 +333,7 @@ void Game::setGameState(GameState_t newState)
 			auto it = players.begin();
 			while (it != players.end()) {
 				if (!it->second->hasFlag(PlayerFlag_CanAlwaysLogin)) {
-					it->second->kickPlayer(true);
+					it->second->removePlayer(true);
 					it = players.begin();
 				} else {
 					++it;
@@ -7016,7 +7016,7 @@ void Game::kickPlayer(uint32_t playerId, bool displayEffect)
 		return;
 	}
 
-	player->kickPlayer(displayEffect);
+	player->removePlayer(displayEffect);
 }
 
 void Game::playerCyclopediaCharacterInfo(Player* player, uint32_t characterID, CyclopediaCharacterInfoType_t characterInfoType, uint16_t entriesPerPage, uint16_t page) {

diff --git a/src/items/bed.cpp b/src/items/bed.cpp
@@ -162,9 +162,8 @@ bool BedItem::sleep(Player* player)
 	// display 'Zzzz'/sleep effect
 	g_game.addMagicEffect(player->getPosition(), CONST_ME_SLEEP);
 
-	// kick player after he sees himself walk onto the bed and it change id
-	uint32_t playerId = player->getID();
-	g_scheduler.addEvent(createSchedulerTask(SCHEDULER_MINTICKS, std::bind(&Game::kickPlayer, &g_game, playerId, false)));
+	// logout player after he sees himself walk onto the bed and it change id
+	g_scheduler.addEvent(createSchedulerTask(SCHEDULER_MINTICKS, std::bind(&ProtocolGame::logout, player->client, false, false)));
 
 	// change self and partner's appearance
 	updateAppearance(player);

diff --git a/src/lua/functions/creatures/creature_functions.cpp b/src/lua/functions/creatures/creature_functions.cpp
@@ -688,7 +688,7 @@ int CreatureFunctions::luaCreatureIsImmune(lua_State* L) {
 }
 
 int CreatureFunctions::luaCreatureRemove(lua_State* L) {
-	// creature:remove()
+	// creature:remove([forced = true])
 	Creature** creaturePtr = getRawUserdata<Creature>(L, 1);
 	if (!creaturePtr) {
 		lua_pushnil(L);
@@ -702,8 +702,13 @@ int CreatureFunctions::luaCreatureRemove(lua_State* L) {
 	}
 
 	Player* player = creature->getPlayer();
+	bool forced = getBoolean(L, 2, true);
 	if (player) {
-		player->kickPlayer(true);
+		if (forced) {
+			player->removePlayer(true);
+		} else {
+			player->removePlayer(true, false);
+		}
 	} else {
 		g_game.removeCreature(creature);
 	}