diff -r cd26d468b746 -r 57ad0b4ba543 cssdm_events.cpp --- a/cssdm_events.cpp Sun Jul 22 14:46:54 2012 -0400 +++ b/cssdm_events.cpp Tue Jul 24 10:09:21 2012 -0400 @@ -345,7 +345,7 @@ player->is_spawned = true; /* If we were waiting to respawn, cancel the timer */ - if (player->respawn_timer) + if (player->respawn_timer && !player->pBot) { timersys->KillTimer(player->respawn_timer); player->respawn_timer = NULL;