From 6158e9619f675d9fcc6f4fd6a9c00ffaf1134be3 Mon Sep 17 00:00:00 2001
From: Miner34dev <134534394+Miner34dev@users.noreply.github.com>
Date: Wed, 6 Mar 2024 23:41:38 +0100
Subject: [PATCH] Fix camera following tux when dying (#2807)

Fixes #2799
---
 src/object/camera.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/object/camera.cpp b/src/object/camera.cpp
index 47d25231d50..6d964f45219 100644
--- a/src/object/camera.cpp
+++ b/src/object/camera.cpp
@@ -315,13 +315,16 @@ Camera::update(float dt_sec)
 
   switch (m_mode) {
     case Mode::NORMAL:
-      if (Sector::current() && Sector::current()->get_object_count<Player>() > 1)
+      if (Sector::current())
       {
-        update_scroll_normal_multiplayer(dt_sec);
-      }
-      else
-      {
-        update_scroll_normal(dt_sec);
+        if (Sector::current()->get_object_count<Player>() > 1)
+        {
+          update_scroll_normal_multiplayer(dt_sec);
+        }
+        else if (!(Sector::current()->get_players()[0]->is_dying()))
+        {
+          update_scroll_normal(dt_sec);
+        }
       }
       break;
     case Mode::MANUAL: