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

Remove MindHelpers, stop using PlayerHelpers.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-21 17:59:27 +01:00
parent eeb0adc5cd
commit a666ddb045
3 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Recycling/Components/RecyclerComponent.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.Act;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
using Content.Server.Mind.Components;
using Content.Server.Players;
using Content.Server.Popups;
using Content.Shared.Body.Components;
@@ -47,9 +48,7 @@ namespace Content.Server.Recycling.Components
SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat)
{
var mind = victim.PlayerSession()?.ContentData()?.Mind;
if (mind != null)
if (victim.TryGetComponent(out ActorComponent? actor) && actor.PlayerSession.ContentData()?.Mind is {} mind)
{
EntitySystem.Get<GameTicker>().OnGhostAttempt(mind, false);
mind.OwnedEntity?.PopupMessage(Loc.GetString("recycler-component-suicide-message"));