Merge branch 'master' into prediction

2020-04-18 14:07:02 +02:00
parent f790eeb34d dd6c919a32
commit 93c8007f5e
237 changed files with 4278 additions and 1948 deletions
--- a/Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs
+++ b/Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs
@@ -76,10 +76,6 @@ namespace Content.Client.GameObjects.Components.Mobs

        private void PlayerDetached()
        {
-            if (!CurrentlyControlled)
-            {
-                return;
-            }
            _ui?.Dispose();
            _ui = null;
        }