diff --git a/QSB/DeathSync/RespawnOnDeath.cs b/QSB/DeathSync/RespawnOnDeath.cs index 8268c895..a16a02ed 100644 --- a/QSB/DeathSync/RespawnOnDeath.cs +++ b/QSB/DeathSync/RespawnOnDeath.cs @@ -132,9 +132,7 @@ namespace QSB.DeathSync { return _playerSpawner .GetValue("_spawnList") - .FirstOrDefault(spawnPoint => - spawnPoint.GetSpawnLocation() == SpawnLocation.TimberHearth && spawnPoint.IsShipSpawn() == isShip - ); + .FirstOrDefault(spawnPoint => spawnPoint.GetSpawnLocation() == SpawnLocation.TimberHearth && spawnPoint.IsShipSpawn() == isShip); } } } diff --git a/QSB/TransformSync/PlayerHUDMarker.cs b/QSB/TransformSync/PlayerHUDMarker.cs index 6512449a..3f0aaf1a 100644 --- a/QSB/TransformSync/PlayerHUDMarker.cs +++ b/QSB/TransformSync/PlayerHUDMarker.cs @@ -1,7 +1,4 @@ -using OWML.Common; -using QSB.Utility; -using System; -using UnityEngine; +using UnityEngine; namespace QSB.TransformSync { @@ -50,17 +47,13 @@ namespace QSB.TransformSync public void Remove() { // do N O T destroy the parent - it completely breaks the ENTIRE GAME - try + if (_canvasMarker.gameObject != null) { _canvasMarker.DestroyMarker(); - Destroy(_markerTarget.gameObject); - Destroy(this); } - catch (Exception ex) - { - DebugLog.ToConsole($"Warning - Failed to remove PlayerHUDMarker for {_player.Name} ({_player.NetId}) : {ex}", MessageType.Warning); - } - + Destroy(_markerTarget.gameObject); + Destroy(this); } + } }