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

Enable nullability in Content.Server (#3685)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-16 15:50:20 +01:00
committed by GitHub
parent 90fec0ed24
commit a5ade526b7
306 changed files with 1616 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GlobalVerbs/ControlMobVerb.cs
View File

@@ -52,15 +52,15 @@ namespace Content.Server.GlobalVerbs
return;
}
var userMind = player.ContentData().Mind;
var userMind = player.ContentData()?.Mind;
var targetMind = target.GetComponent<MindComponent>();
var oldEntity = userMind.CurrentEntity;
var oldEntity = userMind?.CurrentEntity;
targetMind.Mind?.TransferTo(null);
userMind.TransferTo(target);
userMind?.TransferTo(target);
if (oldEntity.HasComponent<GhostComponent>())
if (oldEntity != null && oldEntity.HasComponent<GhostComponent>())
oldEntity.Delete();
}
}