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

Fix more errors, client and server now build

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-06 14:00:39 +01:00
parent 525297c5fe
commit af4eb3c7cd
32 changed files with 94 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/CombatMode/CombatModeSystem.cs
View File

@@ -33,13 +33,8 @@ namespace Content.Client.CombatMode
public bool IsInCombatMode()
{
var entity = _playerManager.LocalPlayer?.ControlledEntity;
if (entity == default || !EntityManager.TryGetComponent(entity.Value, out CombatModeComponent? combatMode))
{
return false;
}
return combatMode.IsInCombatMode;
return EntityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out CombatModeComponent? combatMode) &&
combatMode.IsInCombatMode;
}
private void OnTargetingZoneChanged(TargetingZone obj)
@@ -47,4 +42,8 @@ namespace Content.Client.CombatMode
EntityManager.RaisePredictiveEvent(new CombatModeSystemMessages.SetTargetZoneMessage(obj));
}
}
public static class A
{
}
}