From 6743b9b6aabfa2f6c6d558c37d83fa29f3e98b4d Mon Sep 17 00:00:00 2001
From: Kibi Kelburton <git@f0ck.it>
Date: Thu, 7 May 2026 18:18:12 +0200
Subject: [PATCH] fixing rejoin wait time for giving player weapon

---
 gunfun/mod/main.gsc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gunfun/mod/main.gsc b/gunfun/mod/main.gsc
index 1b4bcac..44226f9 100755
--- a/gunfun/mod/main.gsc
+++ b/gunfun/mod/main.gsc
@@ -846,10 +846,14 @@ takeInvalidWeapon()
     self endon("death");
     level endon("nuke");
     counter = 0;
-    waitFrame(); // was: wait 3 — removed so mid-game joiners get their weapon immediately
+    // Skip the first 5 frames so the initial updateWeapon() from loadSetup() has
+    // time to complete its switchtoweaponimmediate before we start polling.
+    // This prevents a false-positive correction that was causing the 2.5s delay.
+    for(i = 0; i < 5; i++)
+        waitFrame();
     while(1)
     {
-        wait 0.1; // was waitFrame() (~60/s) — 10/s is ample for a safety-net poller
+        wait 0.1; // 10/s is ample for a safety-net poller
         if(!isAlive(self))
             continue;
         if(self isMantling())
@@ -868,7 +872,9 @@ takeInvalidWeapon()
         {
             self takeAllWeapons();
             self thread updateWeapon();
-            wait 2.5;
+            // Short cooldown — just enough for switchtoweaponimmediate to settle.
+            // The old 2.5s wait was causing the visible mid-game-join delay.
+            wait 0.5;
         }
     }
 }