summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2012-08-03 15:55:42 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2012-08-03 16:26:08 +0200
commita3182ee3fc0317e52b6190553b02855b7b031ecd (patch)
tree221b436064bb79ac49d4a0584c98ba1e87a4ddf9
parentdb5da23a7fcad34b4e4cd30626f90a07047ceacc (diff)
downloadmanaserv-a3182ee3fc0317e52b6190553b02855b7b031ecd.tar.gz
manaserv-a3182ee3fc0317e52b6190553b02855b7b031ecd.tar.bz2
manaserv-a3182ee3fc0317e52b6190553b02855b7b031ecd.tar.xz
manaserv-a3182ee3fc0317e52b6190553b02855b7b031ecd.zip
Fixed dead characters being able to use items.
Change is tested. Mantis: #492. Reviewed-by: Stefan Beller.
-rw-r--r--src/game-server/gamehandler.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index 28f3bae8..bbc727a5 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -519,7 +519,11 @@ void GameHandler::handlePickup(GameClient &client, MessageIn &message)
void GameHandler::handleUseItem(GameClient &client, MessageIn &message)
{
+ if (client.character->getAction() == DEAD)
+ return;
+
const int slot = message.readInt16();
+
Inventory inv(client.character);
if (ItemClass *ic = itemManager->getItem(inv.getItem(slot)))