about summary refs log tree commit diff
path: root/src/game/server/player.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/server/player.cpp')
-rw-r--r--src/game/server/player.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index 02e92c36..b31c4d2f 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -9,6 +9,7 @@ MACRO_ALLOC_POOL_ID_IMPL(PLAYER, MAX_CLIENTS)
 
 PLAYER::PLAYER(int client_id)
 {
+	respawn_tick = server_tick();
 	character = 0;
 	this->client_id = client_id;
 }
@@ -56,7 +57,7 @@ void PLAYER::tick()
 			character = 0;
 		}
 	}
-	else if(spawning)
+	else if(spawning && respawn_tick <= server_tick())
 		try_respawn();
 }