summaryrefslogtreecommitdiff
path: root/src/environment.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-01-18 00:27:14 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-01-18 00:27:14 +0200
commitb6787a2b588f516184bf53ef8ae6af79ca54af25 (patch)
tree4173646b2a082c30a5c8392b7b66e3b58048e63c /src/environment.cpp
parent198632673196c87c5ba549721300d2e2b452f28b (diff)
downloadminetest-b6787a2b588f516184bf53ef8ae6af79ca54af25.tar.gz
minetest-b6787a2b588f516184bf53ef8ae6af79ca54af25.tar.bz2
minetest-b6787a2b588f516184bf53ef8ae6af79ca54af25.zip
fixed erroneus handling of many players with no peer existing at same time
Diffstat (limited to 'src/environment.cpp')
-rw-r--r--src/environment.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/environment.cpp b/src/environment.cpp
index 17b98acd1..6d987e3c2 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -194,7 +194,8 @@ void Environment::addPlayer(Player *player)
#ifndef SERVER
assert(player->isLocal() == false || getLocalPlayer() == NULL);
#endif
- assert(getPlayer(player->peer_id) == NULL);
+ if(player->peer_id != 0)
+ assert(getPlayer(player->peer_id) == NULL);
m_players.push_back(player);
}