spt/modules
spt/modules
0
0
Fork 0
mirror of https://github.com/sp-tarkov/modules.git synced 2025-02-13 09:50:43 -05:00
Code

Make dogtag patch more resilient

Browse Source
This commit is contained in:
Dev 2023-07-13 08:58:45 +01:00
parent 2edf259271
commit 3a19e0df56
1 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
project/Aki.SinglePlayer/Patches/Quests/DogtagPatch.cs
View File

@ -25,33 +25,69 @@ namespace Aki.SinglePlayer.Patches.Quests
return typeof(Player).GetMethod("OnBeenKilledByAggressor", _flags); return typeof(Player).GetMethod("OnBeenKilledByAggressor", _flags);
} }
/// <summary>
/// Patch OnBeenKilledByAggressor()
/// </summary>
/// <param name="__instance"></param>
/// <param name="aggressor">Player who killed this individuak</param>
/// <param name="damageInfo">Data on how they died</param>
[PatchPostfix] [PatchPostfix]
private static void PatchPostfix(Player __instance, Player aggressor, DamageInfo damageInfo) private static void PatchPostfix(Player __instance, Player aggressor, DamageInfo damageInfo)
{ {
if (__instance.Profile.Info.Side == EPlayerSide.Savage) if (__instance.Profile?.Info?.Side == EPlayerSide.Savage)
{ {
// Scav died, we don't care
return; return;
} }
var equipment = (EquipmentClass)_getEquipmentProperty.GetValue(__instance); Item dogtagItem = GetDogTagItemFromPlayerWhoDied(__instance);
var dogtagSlot = equipment.GetSlot(EquipmentSlot.Dogtag); if (dogtagItem == null)
var dogtagItem = dogtagSlot.ContainedItem;
// no dogtag item + its not on the player
if (dogtagItem == null && !__instance.IsYourPlayer)
{ {
if (__instance.IsYourPlayer)
{
// Human player, expected behaviour
return;
}
Logger.LogError($"DogtagPatch error > DogTag slot item on: {__instance.Profile?.Info?.Nickname} is null somehow."); Logger.LogError($"DogtagPatch error > DogTag slot item on: {__instance.Profile?.Info?.Nickname} is null somehow.");
return; return;
} }
var itemComponent = dogtagItem.GetItemComponent<DogtagComponent>(); var itemComponent = dogtagItem.GetItemComponent<DogtagComponent>();
if (itemComponent == null) if (itemComponent == null)
{ {
Logger.LogError("DogtagPatch error > DogTagComponent on dog tag slot is null. Something went horrifically wrong!"); Logger.LogError("DogtagPatch error > DogTagComponent on dog tag slot is null. Something went horrifically wrong!");
return; return;
} }
UpdateDogtagItemWithDeathDetails(__instance, aggressor, damageInfo, itemComponent);
}
private static Item GetDogTagItemFromPlayerWhoDied(Player __instance)
{
var equipment = (EquipmentClass)_getEquipmentProperty.GetValue(__instance);
if (equipment == null)
{
Logger.LogError("DogtagPatch error > Player has no equipment");
return null;
}
var dogtagSlot = equipment.GetSlot(EquipmentSlot.Dogtag);
if (dogtagSlot == null)
{
Logger.LogError("DogtagPatch error > Player has no dogtag slot");
return null;
}
var dogtagItem = dogtagSlot?.ContainedItem;
return dogtagItem;
}
private static void UpdateDogtagItemWithDeathDetails(Player __instance, Player aggressor, DamageInfo damageInfo, DogtagComponent itemComponent)
{
var victimProfileInfo = __instance.Profile.Info; var victimProfileInfo = __instance.Profile.Info;
itemComponent.AccountId = __instance.Profile.AccountId; itemComponent.AccountId = __instance.Profile.AccountId;