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

Fixes ghost NRE in lobby (#1907)

Browse Source 
Simply tells the player "You can't ghost here!" when they try it in the lobby, works for both normal ghost and aghost
This commit is contained in:
NuclearWinter
2020-08-25 05:37:54 -06:00
committed by GitHub
parent 318f051fb9
commit a854a86872
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Administration/AGhost.cs
View File

@@ -22,6 +22,12 @@ namespace Content.Server.Administration
} }
var mind = player.ContentData().Mind; var mind = player.ContentData().Mind;
if (mind == null)
{
shell.SendText(player, "You can't ghost here!");
return;
}
if (mind.VisitingEntity != null && mind.VisitingEntity.Prototype.ID == "AdminObserver") if (mind.VisitingEntity != null && mind.VisitingEntity.Prototype.ID == "AdminObserver")
{ {
var visiting = mind.VisitingEntity; var visiting = mind.VisitingEntity;

6
Content.Server/Observer/Ghost.cs
View File

@@ -28,6 +28,12 @@ namespace Content.Server.Observer
} }
var mind = player.ContentData().Mind; var mind = player.ContentData().Mind;
if (mind == null)
{
shell.SendText(player, "You can't ghost here!");
return;
}
var canReturn = player.AttachedEntity != null && CanReturn; var canReturn = player.AttachedEntity != null && CanReturn;
var name = player.AttachedEntity?.Name ?? player.Name; var name = player.AttachedEntity?.Name ?? player.Name;