From 5748a0af7b923544b9310e33e46326126568324d Mon Sep 17 00:00:00 2001
From: Sofia <sofia@teascade.net>
Date: Sun, 26 Jul 2026 19:43:03 +0300
Subject: [PATCH] Stop playback on local player respawn

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

diff --git a/rust/src/game_manager.rs b/rust/src/game_manager.rs
index 03b8c77..67f4917 100644
--- a/rust/src/game_manager.rs
+++ b/rust/src/game_manager.rs
@@ -785,6 +785,10 @@ impl Game {
     }
 
     pub fn spawn_player_server(&mut self, id: u16) -> Option<DynGd<CharacterBody3D, dyn IPlayer>> {
+        if id == self.self_id.unwrap_or(0) {
+            self.stop_playback();
+        }
+
         if let Some(player) = self.find_player_mut(id)
             && let Some(character) = &mut player.character
         {
@@ -854,6 +858,10 @@ impl Game {
 
     // Method called on the client-side whenever a player has spawned
     pub fn spawn_player_client(&mut self, id: u16, transform: NetTransform) {
+        if id == self.self_id.unwrap_or(0) {
+            self.stop_playback();
+        }
+
         if let Some(map) = &mut self.current_map {
             if let Some(player) = self.players.iter_mut().find(|p| p.id() == id) {
                 if let Some(character) = &mut player.character {