Merge remote-tracking branch 'upstream/master'

Content.Client/Popups/PopupSystem.cs

@@ -93,11 +93,14 @@ namespace Content.Client.Popups
 
             _aliveWorldLabels.Add(label);
 
-            // START WhiteDream 
+            // START WhiteDream
             if (!_isLogging)
                 return;
 
-            if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity!.Value, coordinates, 10))
+            if (_playerManager.LocalEntity == null)
+                return;
+
+            if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity.Value, coordinates, 10))
                 return;
 
             var fontSizeDict = new Dictionary<PopupType, string>
@@ -117,7 +120,7 @@ namespace Content.Client.Popups
             var chatMsg = new ChatMessage(ChatChannel.Emotes, message, wrappedMEssage,
                 GetNetEntity(EntityUid.Invalid), null);
             _uiManager.GetUIController<ChatUIController>().ProcessChatMessage(chatMsg);
-            
+
             // END WhiteDream
         }
 

Content.Client/_White/Animations/FlipOnHitSystem.cs

@@ -32,6 +32,9 @@ public sealed class FlipOnHitSystem : SharedFlipOnHitSystem
         if (!_timing.IsFirstTimePredicted)
             return;
 
+        if (TerminatingOrDeleted(user))
+            return;
+
         if (_animationSystem.HasRunningAnimation(user, EmoteAnimationSystem.AnimationKey))
         {
             EnsureComp<FlippingComponent>(user);