Properly turn round_handler off and forbid reviving players if game is over

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 64156043d29eeb05ad3232ae848e12f01c338c81..b543fba6a4369ce12ccc6915012dcbc55a1ebbf5 100644 (file)
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -408,6 +408,9 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
        float n;
        vector revive_extra_size;
 
+       if(gameover)
+               return 1;
+
        if(self.freezetag_frozen)
        {
                // keep health = 1

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 882538d1ef0942076be66a86b131dd7c62fb71e1..5f61dc01f332a539386a629f47e90962d7e70498 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -123,5 +123,6 @@ void round_handler_Stop()
 void round_handler_Remove()
 {
        remove(round_handler);
+       round_handler = world;
 }