Merge physics rewrite

2020-05-23 01:23:36 +02:00
parent b6b4482ca0
commit 18ce80a43c
20 changed files with 224 additions and 104 deletions
--- a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs
+++ b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs
@@ -195,7 +195,7 @@ namespace Content.Server.GameObjects

            if (entity.TryGetComponent(out CollidableComponent collidable))
            {
-                collidable.CollisionEnabled = false;
+                collidable.CanCollide = false;
            }
        }

@@ -205,7 +205,7 @@ namespace Content.Server.GameObjects

            if (entity.TryGetComponent(out CollidableComponent collidable))
            {
-                collidable.CollisionEnabled = true;
+                collidable.CanCollide = true;
            }
        }