From f54d869aa119feeaebac88ea76d3665907935f0c Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 19 Aug 2015 00:47:18 +0200 Subject: [PATCH] Reset item times on warmup end / game restart --- qcsrc/server/command/vote.qc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 6ea03dd43..4bd4e414a 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -357,6 +357,12 @@ void reset_map(float dorespawn) MUTATOR_CALLHOOK(reset_map_global); + // ALL the times need to be reset before .reset()ing each item + // since Item_Reset schedules respawn of superweapons and powerups + for(self = world; (self = nextent(self)); ) + if(IS_NOT_A_CLIENT(self)) + Item_ItemsTime_SetTime(self, 0); + for(self = world; (self = nextent(self)); ) if(IS_NOT_A_CLIENT(self)) { @@ -384,6 +390,8 @@ void reset_map(float dorespawn) } } + Item_ItemsTime_SetTimesForAllPlayers(); + FOR_EACH_PLAYER(self) if(self.frozen) Unfreeze(self); -- 2.39.2