diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-01-03 23:18:05 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-01-03 23:19:29 +0100 |
| commit | b9fbd8529d6aa8d8f229eae81b16134de07db346 (patch) | |
| tree | ceea6eecbd26c973441ee5f4f05362fd78c72cb0 /src/net/tmwa | |
| parent | 0bb9a42066e4cf0f9fbc83fa2e742053dc40f1d4 (diff) | |
| parent | 2851c8962522a4e8f8b62a498b113dc6b1eab56d (diff) | |
| download | mana-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.gz mana-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.bz2 mana-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.xz mana-b9fbd8529d6aa8d8f229eae81b16134de07db346.zip | |
Merge branch '0.5'
Conflicts:
po/es.po
po/fr.po
src/net/tmwa/adminhandler.cpp
update-creator.sh
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/adminhandler.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 2795df8a..53e4bfd8 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -68,9 +68,11 @@ void AdminHandler::handleMessage(Net::MessageIn &msg) case SMSG_ADMIN_IP: id = msg.readInt32(); int ip = msg.readInt32(); - Being *player = actorSpriteManager->findBeing(id); - player->setIp(ip); - player->updateName(); + if (Being *player = actorSpriteManager->findBeing(id)) + { + player->setIp(ip); + player->updateName(); + } break; } } |