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

Fix gib pulling player back from ghost (#3664)

Browse Source
This commit is contained in:
ShadowCommander
2021-03-14 19:28:44 -07:00
committed by GitHub
parent 2023741691
commit a6d8c93a16
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Mobs/Mind.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Observer;
using Content.Server.Mobs.Roles; using Content.Server.Mobs.Roles;
using Content.Server.Objectives; using Content.Server.Objectives;
using Content.Server.Players; using Content.Server.Players;
@@ -225,13 +226,14 @@ namespace Content.Server.Mobs
OwnedComponent = component; OwnedComponent = component;
OwnedComponent?.InternalAssignMind(this); OwnedComponent?.InternalAssignMind(this);
if (VisitingEntity?.HasComponent<GhostComponent>() == false)
VisitingEntity = null;
// Player is CURRENTLY connected. // Player is CURRENTLY connected.
if (Session != null && !alreadyAttached) if (Session != null && !alreadyAttached && VisitingEntity == null)
{ {
Session.AttachToEntity(entity); Session.AttachToEntity(entity);
} }
VisitingEntity = null;
} }
public void RemoveOwningPlayer() public void RemoveOwningPlayer()