From fe4926b11ce3b5de1901508af3f4363de0c9ff64 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 4 Jan 2017 23:03:56 +0100 Subject: [PATCH] Fix another game over check; remove some redundant checks --- qcsrc/common/mutators/mutator/nades/nades.qc | 4 ---- qcsrc/server/miscfunctions.qc | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 627321ea0..413dd99f5 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -769,7 +769,6 @@ void nade_touch(entity this, entity toucher) if(autocvar_g_nades_pickup) if(time >= this.spawnshieldtime) if(!toucher.nade && this.health == this.max_health) // no boosted shot pickups, thank you very much - if(!STAT(FROZEN, toucher)) if(CanThrowNade(toucher)) // prevent some obvious things, like dead players if(IS_REAL_CLIENT(toucher)) // above checks for IS_PLAYER, don't need to do it here { @@ -1106,9 +1105,6 @@ bool CanThrowNade(entity this) if(this.vehicle) return false; - if(game_stopped) - return false; - if(IS_DEAD(this)) return false; diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 6e2fdfc0f..9d0b85385 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -479,7 +479,7 @@ void GetCvars(entity this, int f) string playername(entity p) { string t; - if (teamplay && !game_stopped && IS_PLAYER(p)) + if (teamplay && !intermission_running && IS_PLAYER(p)) { t = Team_ColorCode(p.team); return strcat(t, strdecolorize(p.netname)); -- 2.39.2