From 4e63c977c782e81e828445d20c836d84e3ba1766 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 13 Mar 2015 08:57:19 +0100 Subject: Use the new Player::isDead function when it's the case --- src/network/packethandlers/server.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/network/packethandlers') diff --git a/src/network/packethandlers/server.cpp b/src/network/packethandlers/server.cpp index b188bb931..537858e52 100644 --- a/src/network/packethandlers/server.cpp +++ b/src/network/packethandlers/server.cpp @@ -556,7 +556,9 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt) } // If player is dead we don't care of this packet - if (player->hp == 0) { + if (player->isDead()) { + verbosestream << "TOSERVER_PLAYERPOS: " << player->getName() + << " is dead. Ignoring packet"; return; } @@ -921,6 +923,8 @@ void Server::handleCommand_Breath(NetworkPacket* pkt) * He is dead ! */ if (player->isDead()) { + verbosestream << "TOSERVER_BREATH: " << player->getName() + << " is dead. Ignoring packet"; return; } @@ -1051,7 +1055,7 @@ void Server::handleCommand_Respawn(NetworkPacket* pkt) return; } - if (player->hp != 0 || !g_settings->getBool("enable_damage")) + if (!player->isDead() || !g_settings->getBool("enable_damage")) return; RespawnPlayer(pkt->getPeerId()); @@ -1108,9 +1112,9 @@ void Server::handleCommand_Interact(NetworkPacket* pkt) return; } - if (player->hp == 0) { + if (player->isDead()) { verbosestream << "TOSERVER_INTERACT: " << player->getName() - << " tried to interact, but is dead!" << std::endl; + << " is dead. Ignoring packet"; return; } -- cgit v1.2.3