about summary refs log tree commit diff
path: root/src/game/server
diff options
context:
space:
mode:
authorDominik Geyer <dominik.geyer@gmx.de>2008-11-04 13:19:05 +0000
committerDominik Geyer <dominik.geyer@gmx.de>2008-11-04 13:19:05 +0000
commit0259e5c3e5acdebdc8669c2b5b91f26cce1945a1 (patch)
treebc6679c1513228f7aeb13afc83803229558bde50 /src/game/server
parentd37c54a995f488285b6da07c6a9474aebdf9c991 (diff)
downloadzcatch-0259e5c3e5acdebdc8669c2b5b91f26cce1945a1.tar.gz
zcatch-0259e5c3e5acdebdc8669c2b5b91f26cce1945a1.zip
fixed null-pointer server-crash
Diffstat (limited to 'src/game/server')
-rw-r--r--src/game/server/gamemodes/ctf.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp
index 90c77515..498a41c9 100644
--- a/src/game/server/gamemodes/ctf.cpp
+++ b/src/game/server/gamemodes/ctf.cpp
@@ -208,6 +208,6 @@ void FLAG::snap(int snapping_client)
 	
 	if(at_stand)
 		flag->carried_by = -2;
-	else if(carrying_character)
+	else if(carrying_character && carrying_character->player)
 		flag->carried_by = carrying_character->player->client_id;
 }