Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix event crashing when ghosts are present.

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-10-09 12:04:18 +02:00
parent ea30709cde
commit 4e085d8847
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/StationEvents/BoltsDown.cs
View File

@@ -1,3 +1,4 @@
#nullable enable
using JetBrains.Annotations; using JetBrains.Annotations;
using Content.Server.GameObjects.Components.Doors; using Content.Server.GameObjects.Components.Doors;
using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.GUI;
@@ -39,10 +40,9 @@ namespace Content.Server.StationEvents
var playerManager = IoCManager.Resolve<IPlayerManager>(); var playerManager = IoCManager.Resolve<IPlayerManager>();
foreach (var player in playerManager.GetAllPlayers()) foreach (var player in playerManager.GetAllPlayers())
{ {
var inventory = player.AttachedEntity.GetComponent<InventoryComponent>(); if (player.AttachedEntity == null || !player.AttachedEntity.TryGetComponent(out InventoryComponent? inventory)) return;
if (player.AttachedEntity == null) return; if (inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.BELT, out ItemComponent? item)
if (inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.BELT, out ItemComponent item) && item?.Owner.Prototype?.ID == "UtilityBeltClothingFilledEvent") return;
&& item.Owner.Prototype.ID == "UtilityBeltClothingFilledEvent") return;
if (player.AttachedEntity.TryGetComponent<IDamageableComponent>(out var damageable) if (player.AttachedEntity.TryGetComponent<IDamageableComponent>(out var damageable)
&& damageable.CurrentDamageState == DamageState.Dead) return; && damageable.CurrentDamageState == DamageState.Dead) return;