From eb47aa385bb02d977c9ee759c2b7987951c16953 Mon Sep 17 00:00:00 2001
From: Dominik Geyer <dominik.geyer@gmx.de>
Date: Fri, 17 Oct 2008 15:38:36 +0000
Subject: added delay before respawn when using the kill-command; provided and
 tested by scosu; ticket #463

---
 src/game/server/player.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/game/server/player.cpp')

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();
 }
 
-- 
cgit 1.4.1