about summary refs log tree commit diff
diff options
context:
space:
mode:
-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;
 }