From d25104aa8dea5a2654d38393d49ceeb2cf40169b Mon Sep 17 00:00:00 2001
From: Sofia <sofia@teascade.net>
Date: Fri, 24 Jul 2026 23:03:52 +0300
Subject: [PATCH] Properly update clientside player weapon at spawn

---
 rust/src/game_manager.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rust/src/game_manager.rs b/rust/src/game_manager.rs
index 8cd74e3..8605403 100644
--- a/rust/src/game_manager.rs
+++ b/rust/src/game_manager.rs
@@ -785,12 +785,18 @@ impl Game {
                     character.queue_free();
                 }
 
-                let character = map.bind_mut().spawn_player(
+                let mut character = map.bind_mut().spawn_player(
                     player.id(),
                     player.data.team,
                     player.id() == self.self_id.unwrap_or(0),
                     Some(transform),
                 );
+                if let Some(character) = &mut character {
+                    character
+                        .dyn_bind_mut()
+                        .swap_weapon(player.last_held_weapon, true);
+                }
+
                 player.character = character;
             }
         }