From 29862b4323f7e891749864a773ddec2d8436e16c Mon Sep 17 00:00:00 2001
From: Kibi Kelburton <git@f0ck.it>
Date: Wed, 6 May 2026 17:50:27 +0200
Subject: [PATCH] Reapply "fighting the loop!"

This reverts commit 5a828189ec84e8cf733b23e86f993fbd70c90b8c.
---
 gunfun/mod/main.gsc    | 12 +++++++++++-
 gunfun/mod/weapons.gsc |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gunfun/mod/main.gsc b/gunfun/mod/main.gsc
index 5d44d1f..6e6cf62 100755
--- a/gunfun/mod/main.gsc
+++ b/gunfun/mod/main.gsc
@@ -279,6 +279,7 @@ setStartWeapon(team)
         self.current = level.teamKills[team + "_weapon"];
 }
 loadSetup()
+    self notify("stop_watch_threads");
 {
     self hide();
     self thread mod\streaks::setStreaks();
@@ -1094,6 +1095,7 @@ watchVersion()
 watchHealthHUD()
 {
     self endon("disconnect");
+    self endon("stop_watch_threads");
     self endon("death");
     
     if(isDefined(self.healthHUD))
@@ -1117,6 +1119,7 @@ watchHealthHUD()
 watchRegen()
 {
     self endon("disconnect");
+    self endon("stop_watch_threads");
     self endon("death");
     
     while(true)
@@ -1138,6 +1141,7 @@ watchRegen()
 watchDeagleGL()
 {
     self endon("disconnect");
+    self endon("stop_watch_threads");
     while(true)
     {
         self waittill("weapon_fired", weaponName);
@@ -1152,14 +1156,17 @@ watchDeagleGL()
             if(isDefined(self.pers["isBot"]) && self.pers["isBot"])
                 wait .6;
             else
-                wait .2;
+                wait .15;
         }
+        else
+            wait .05;
     }
 }
 
 watchHUD()
 {
     self endon("disconnect");
+    self endon("stop_watch_threads");
     while(true)
     {
         self setClientDvar("ui_drawradar", 1);
@@ -1180,6 +1187,7 @@ watchHUD()
 watchM40A3()
 {
     self endon("disconnect");
+    self endon("stop_watch_threads");
     while(true)
     {
         self waittill("weapon_fired", weaponName);
@@ -1200,5 +1208,7 @@ watchM40A3()
                 wait .1;
             }
         }
+        else
+            wait .05;
     }
 }
diff --git a/gunfun/mod/weapons.gsc b/gunfun/mod/weapons.gsc
index b3813d3..3b544e0 100755
--- a/gunfun/mod/weapons.gsc
+++ b/gunfun/mod/weapons.gsc
@@ -550,7 +550,6 @@ loadFungameList()
     addFungameWeapon("wa2000_thermal_mp");
     addFungameWeapon("m21_mp");
     addFungameWeapon("m21_thermal_mp");
-    addFungameWeapon("r700_mp");
 
     // LAUNCHERS & SPECIAL (146-150)
     addFungameWeapon("m79_mp");