This commit is contained in:
Mister_Nebula 2021-02-09 09:11:35 +00:00
parent b10cf20ee4
commit aa387ee386
2 changed files with 5 additions and 9 deletions

View File

@ -1,7 +1,6 @@
using Harmony;
using QSB.Events;
using QSB.Patches;
using QSB.Utility;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Emit;
@ -40,13 +39,11 @@ namespace QSB.DeathSync.Patches
return false;
}
public static void BroadcastDeath(DeathType deathType)
public static void BroadcastDeath(DeathType deathType)
=> GlobalMessenger<DeathType>.FireEvent(EventNames.QSBPlayerDeath, deathType);
public static void DamageController_Exploded(ref bool ____exploded)
{
____exploded = true;
}
public static void DamageController_Exploded(ref bool ____exploded)
=> ____exploded = true;
public static IEnumerable<CodeInstruction> ReturnNull(IEnumerable<CodeInstruction> instructions)
{

View File

@ -1,6 +1,5 @@
using OWML.Common;
using OWML.Utils;
using QSB.Events;
using QSB.Utility;
using System.Linq;
using UnityEngine;
@ -125,11 +124,11 @@ namespace QSB.DeathSync
_shipTractorBeam.ActivateTractorBeam();
}
private SpawnPoint GetSpawnPoint(bool isShip = false)
private SpawnPoint GetSpawnPoint(bool isShip = false)
=> _playerSpawner
.GetValue<SpawnPoint[]>("_spawnList")
.FirstOrDefault(spawnPoint =>
spawnPoint.GetSpawnLocation() == SpawnLocation.TimberHearth
spawnPoint.GetSpawnLocation() == SpawnLocation.TimberHearth
&& spawnPoint.IsShipSpawn() == isShip);
}
}