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

hands ECS (#7081)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-17 20:13:31 +13:00
committed by GitHub
parent 7b84362901
commit bfd95c493b
94 changed files with 1454 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Atmos/Components/GasAnalyzerComponent.cs
View File

@@ -161,7 +161,7 @@ namespace Content.Server.Atmos.Components
if (!_entities.TryGetComponent(playerEntity, out HandsComponent? handsComponent))
return;
if (handsComponent?.GetActiveHandItem?.Owner is not {Valid: true} activeHandEntity ||
if (handsComponent?.ActiveHandEntity is not {Valid: true} activeHandEntity ||
!_entities.TryGetComponent(activeHandEntity, out GasAnalyzerComponent? gasAnalyzer))
{
return;
@@ -228,7 +228,7 @@ namespace Content.Server.Atmos.Components
return;
}
if (handsComponent.GetActiveHandItem?.Owner is not {Valid: true} activeHandEntity ||
if (handsComponent.ActiveHandEntity is not {Valid: true} activeHandEntity ||
!_entities.TryGetComponent(activeHandEntity, out GasAnalyzerComponent? gasAnalyzer))
{
serverMsg.Session.AttachedEntity.Value.PopupMessage(Loc.GetString("gas-analyzer-component-need-gas-analyzer-in-hand-message"));