PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Null protection in multiplayer manager detach

Browse Source
This commit is contained in:
Westin Miller
2017-09-10 15:17:50 -07:00
parent a36e8a4065
commit aa784c121b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Torch/Managers/MultiplayerManagerBase.cs
View File

@@ -47,7 +47,7 @@ namespace Torch.Managers
public event Action<IPlayer> PlayerJoined; public event Action<IPlayer> PlayerJoined;
/// <inheritdoc /> /// <inheritdoc />
public event Action<IPlayer> PlayerLeft; public event Action<IPlayer> PlayerLeft;
public ObservableDictionary<ulong, PlayerViewModel> Players { get; } = new ObservableDictionary<ulong, PlayerViewModel>(); public ObservableDictionary<ulong, PlayerViewModel> Players { get; } = new ObservableDictionary<ulong, PlayerViewModel>();
#pragma warning disable 649 #pragma warning disable 649
@@ -69,7 +69,8 @@ namespace Torch.Managers
/// <inheritdoc /> /// <inheritdoc />
public override void Detach() public override void Detach()
{ {
MyMultiplayer.Static.ClientLeft -= OnClientLeft; if (MyMultiplayer.Static != null)
MyMultiplayer.Static.ClientLeft -= OnClientLeft;
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -114,7 +115,7 @@ namespace Torch.Managers
protected void RaiseClientJoined(ulong steamId) protected void RaiseClientJoined(ulong steamId)
{ {
var vm = new PlayerViewModel(steamId){State=ConnectionState.Connected}; var vm = new PlayerViewModel(steamId) { State = ConnectionState.Connected };
_log.Info($"Player {vm.Name} joined ({vm.SteamId}"); _log.Info($"Player {vm.Name} joined ({vm.SteamId}");
Players.Add(steamId, vm); Players.Add(steamId, vm);
PlayerJoined?.Invoke(vm); PlayerJoined?.Invoke(vm);