tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improves FlammableComponent, allow mobs to collide with each other.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-03-16 12:55:35 +01:00
parent b4493575cc
commit 3affd1118e
5 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/GameObjects/Components/Movement/SharedPlayerMobMoverComponent.cs
View File

@@ -116,10 +116,11 @@ namespace Content.Shared.GameObjects.Components.Movement
{
// Don't collide with other mobs
// unless they have combat mode on
return collidedWith.Entity.HasComponent<IBody>(); /* &&
(!Owner.TryGetComponent(out SharedCombatModeComponent? ownerCombat) || !ownerCombat.IsInCombatMode) &&
(!collidedWith.Entity.TryGetComponent(out SharedCombatModeComponent? otherCombat) || !otherCombat.IsInCombatMode);
*/
return false; //collidedWith.Entity.HasComponent<IBody>();
/* &&
(!Owner.TryGetComponent(out SharedCombatModeComponent? ownerCombat) || !ownerCombat.IsInCombatMode) &&
(!collidedWith.Entity.TryGetComponent(out SharedCombatModeComponent? otherCombat) || !otherCombat.IsInCombatMode);
*/
}
[Serializable, NetSerializable]