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

Fix NRE when pointing happens without player data or a mind (#1855)

Browse Source
This commit is contained in:
DrSmugleaf
2020-08-22 15:18:04 +02:00
committed by GitHub
parent 265afc9929
commit c87a8d5b51
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Players/PlayerData.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Mobs;
#nullable enable
using Content.Server.Mobs;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Network;
using Robust.Shared.ViewVariables;
@@ -22,7 +23,7 @@ namespace Content.Server.Players
/// DO NOT DIRECTLY SET THIS UNLESS YOU KNOW WHAT YOU'RE DOING.
/// </summary>
[ViewVariables]
public Mind Mind { get; set; }
public Mind? Mind { get; set; }
public void WipeMind()
{
@@ -41,15 +42,15 @@ namespace Content.Server.Players
/// <summary>
/// Gets the correctly cast instance of content player data from an engine player data storage.
/// </summary>
public static PlayerData ContentData(this IPlayerData data)
public static PlayerData? ContentData(this IPlayerData data)
{
return (PlayerData)data.ContentDataUncast;
return (PlayerData?) data.ContentDataUncast;
}
/// <summary>
/// Gets the correctly cast instance of content player data from an engine player data storage.
/// </summary>
public static PlayerData ContentData(this IPlayerSession session)
public static PlayerData? ContentData(this IPlayerSession session)
{
return session.Data.ContentData();
}