about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJakob Fries <jakob.fries@gmail.com>2007-07-29 22:20:00 +0000
committerJakob Fries <jakob.fries@gmail.com>2007-07-29 22:20:00 +0000
commitf80dd7097e62c20520d76e77162c7e312ce5e0e0 (patch)
tree890da5b942f085b546e550d27a1940757e8d0542 /src
parent8233a44b605f53b9e852a51efb4dca8f15635198 (diff)
downloadzcatch-f80dd7097e62c20520d76e77162c7e312ce5e0e0.tar.gz
zcatch-f80dd7097e62c20520d76e77162c7e312ce5e0e0.zip
hook no longer hits dead people
Diffstat (limited to 'src')
-rw-r--r--src/game/server/game_server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 844fb3ab..f366b2c7 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -1089,7 +1089,7 @@ void player::tick()
 				if(ent && ent->objtype == OBJTYPE_PLAYER)
 				{
 					player *p = (player*)ent;
-					if(p != this && distance(p->pos, new_pos) < p->phys_size)
+					if(p != this && !p->dead && distance(p->pos, new_pos) < p->phys_size)
 					{
 						hook_state = HOOK_GRABBED;
 						hooked_player = p;