[Feature/Enhancement] - No disconnect on death

.github/workflows/analysis-sonarcloud.yml

@@ -2,7 +2,7 @@
 name: Analysis - SonarCloud
 
 on:
-  pull_request_target:
+  pull_request:
     types: [opened, synchronize, reopened]
   push:
     branches:

src/creatures/creature.cpp

@@ -678,7 +678,7 @@ void Creature::onDeath()
 		setMaster(nullptr);
 	}
 
-	if (droppedCorpse) {
+	if (droppedCorpse && !getPlayer()) {
 		g_game.removeCreature(this, false);
 	}
 }

src/creatures/creature.h

@@ -485,6 +485,13 @@ class Creature : virtual public Thing
 			}
 		}
 
+		void setDead(bool isDead) {
+			dead = isDead;
+		}
+		bool isDead() const {
+			return dead;
+		}
+
 	protected:
 		virtual bool useCacheMap() const {
 			return false;
@@ -570,6 +577,7 @@ class Creature : virtual public Thing
 		bool floorChange = false;
 		bool canUseDefense = true;
 		bool moveLocked = false;
+		bool dead = false;
 
 		//creature script events
 		bool hasEventRegistered(CreatureEventType_t event) const {

src/creatures/players/player.cpp

@@ -2469,6 +2469,91 @@ void Player::death(Creature* lastHitCreature)
 		onIdleStatus();
 		sendStats();
 	}
+	despawn();
+}
+
+bool Player::spawn()
+{
+	setDead(false);
+
+	const Position& pos = getLoginPosition();
+
+	if (!g_game.map.placeCreature(pos, this, false, true)) {
+		return false;
+	}
+
+	SpectatorHashSet spectators;
+	g_game.map.getSpectators(spectators, position, false, true);
+	for (Creature* spectator : spectators) {
+		if (Player* tmpPlayer = spectator->getPlayer()) {
+			tmpPlayer->sendCreatureAppear(this, pos, true);
+		}
+	}
+
+	for (Creature* spectator : spectators) {
+	spectator->onCreatureAppear(this, true);
+	}
+
+	getParent()->postAddNotification(this, nullptr, 0);
+	g_game.addCreatureCheck(this);
+
+	addList();
+	return true;
+}
+
+void Player::despawn()
+{
+	if (isDead()) {
+		return;
+	}
+
+	listWalkDir.clear();
+	stopEventWalk();
+	onWalkAborted();
+
+	// remove check
+	g_game.removeCreatureCheck(this);
+
+	// remove from map
+	Tile* tile = getTile();
+
+	std::vector<int32_t> oldStackPosVector;
+
+	SpectatorHashSet spectators;
+	g_game.map.getSpectators(spectators, tile->getPosition(), true);
+	for (Creature* spectator : spectators) {
+		if (Player* player = spectator->getPlayer()) {
+			oldStackPosVector.push_back(player->canSeeCreature(this) ? tile->getStackposOfCreature(player, this) : -1);
+		}
+	}
+
+	tile->removeCreature(this);
+
+	const Position& tilePosition = tile->getPosition();
+
+	//send to client
+	size_t i = 0;
+	for (Creature* spectator : spectators) {
+		if (Player* player = spectator->getPlayer()) {
+			player->sendRemoveTileThing(tilePosition, oldStackPosVector[i++]);
+		}
+	}
+
+	//event method
+	for (Creature* spectator : spectators) {
+		spectator->onRemoveCreature(this, false);
+	}
+
+	getParent()->postRemoveNotification(this, nullptr, 0);
+
+	g_game.removePlayer(this);
+
+	// show player as pending
+	for (const auto& it : g_game.getPlayers()) {
+		it.second->notifyStatusChange(this, VIPSTATUS_PENDING);
+	}
+
+	setDead(true);
 }
 
 bool Player::dropCorpse(Creature* lastHitCreature, Creature* mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified)

src/creatures/players/player.h

@@ -1596,6 +1596,10 @@ class Player final : public Creature, public Cylinder
 		void forgetInstantSpell(const std::string& spellName);
 		bool hasLearnedInstantSpell(const std::string& spellName) const;
 
+		int64_t getLastPong() const {
+			return lastPong;
+		}
+
 		void setScheduledSaleUpdate(bool scheduled) {
 			scheduledSaleUpdate = scheduled;
 		}
@@ -1876,6 +1880,8 @@ class Player final : public Creature, public Cylinder
 		void setNextPotionActionTask(SchedulerTask* task);
 
 		void death(Creature* lastHitCreature) override;
+		bool spawn();
+		void despawn();
 		bool dropCorpse(Creature* lastHitCreature, Creature* mostDamageCreature,
                         bool lastHitUnjustified, bool mostDamageUnjustified) override;
 		Item* getCorpse(Creature* lastHitCreature, Creature* mostDamageCreature) override;

src/game/game.cpp

@@ -1048,6 +1048,14 @@ bool Game::removeCreature(Creature* creature, bool isLogout/* = true*/)
 		return false;
 	}
 
+	if (creature->isDead()) {
+		creature->removeList();
+		creature->setRemoved();
+		ReleaseCreature(creature);
+		removeCreatureCheck(creature);
+		return true;
+	}
+
 	Tile* tile = creature->getTile();
 
 	std::vector<int32_t> oldStackPosVector;

src/server/network/protocol/protocolgame.cpp

@@ -392,6 +392,35 @@ void ProtocolGame::connect(uint32_t playerId, OperatingSystem_t operatingSystem)
 	acceptPackets = true;
 }
 
+void ProtocolGame::spawn()
+{
+	//dispatcher thread
+	if (!player) {
+		return;
+	}
+
+	if (!player->spawn()) {
+		disconnect();
+		g_game.removeCreature(player);
+		return;
+	}
+
+	sendAddCreature(player, player->getPosition(), 0, false);
+}
+
+void ProtocolGame::despawn()
+{
+	//dispatcher thread
+	if (!player) {
+		return;
+	}
+	//fire onLogout
+	g_creatureEvents->playerLogout(player);
+
+	disconnect();
+	g_game.removeCreature(player);
+}
+
 void ProtocolGame::logout(bool displayEffect, bool forced)
 {
 	//dispatcher thread
@@ -610,16 +639,33 @@ void ProtocolGame::parsePacket(NetworkMessage& msg)
 
 	uint8_t recvbyte = msg.getByte();
 
-	// A dead player can not perform actions
-	if (!player || player->isRemoved() || player->getHealth() <= 0) {
+if (!player || player->isRemoved()) {
 		if (recvbyte == 0x0F) {
-			// we need to make the player pointer != null in this part, game.cpp release is the first step
-			// login(player->getName(), player->getAccount(), player->operatingSystem);
 			disconnect();
+		}
+
+		return;
+	}
+
+	//a dead player can not performs actions
+	if (player->isDead() || player->getHealth() <= 0) {
+		if (recvbyte == 0x14) {
+			g_dispatcher.addTask(createTask(std::bind(&ProtocolGame::despawn, getThis())));
+			return;
+		}
+
+		if (recvbyte == 0x0F) {
+			g_dispatcher.addTask(createTask(std::bind(&ProtocolGame::spawn, getThis())));
+			return;
+		}
+
+		if (OTSYS_TIME() - player->getLastPong() >= 60000) {
+			g_dispatcher.addTask(createTask(std::bind(&ProtocolGame::despawn, getThis())));
 			return;
 		}
 
-		if (recvbyte != 0x14) {
+		if (recvbyte != 0x1D && recvbyte != 0x1E) {
+			// keep the connection alive
 			return;
 		}
 	}

src/server/network/protocol/protocolgame.h

@@ -79,6 +79,9 @@ class ProtocolGame final : public Protocol
 	void login(const std::string &name, uint32_t accnumber, OperatingSystem_t operatingSystem);
 	void logout(bool displayEffect, bool forced);
 
+	void spawn();
+	void despawn();
+
 	void AddItem(NetworkMessage &msg, const Item *item);
 	void AddItem(NetworkMessage &msg, uint16_t id, uint8_t count);