Merge branch 'master' into 20-06-24-movement-prediction

2020-06-24 04:04:43 +02:00
parent da45a52325 78085855db
commit f3a816321c
2259 changed files with 16436 additions and 11772 deletions
--- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
+++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
@@ -187,6 +187,17 @@ namespace Content.Server.GameObjects.Components.Mobs
            _statusRemoveCancellation = new CancellationTokenSource();
        }

+        public void ResetStuns()
+        {
+            _stunnedTimer = 0f;
+            _slowdownTimer = 0f;
+
+            if (KnockedDown)
+                StandingStateHelper.Standing(Owner);
+
+            _knockdownTimer = 0f;
+        }
+
        public void Update(float delta)
        {
            if (Stunned)