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

Removed unnecessary patch BotCallForHelpCallBotPatch

Browse Source 
Removed unnecessary null check
This commit is contained in:
Dev 2024-08-02 14:59:14 +01:00
parent de7e762211
commit 42060f027d
3 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
project/SPT.Custom/Patches/BotCallForHelpCallBotPatch.cs
View File

@ -1,54 +0,0 @@
using SPT.Reflection.Patching;
using EFT;
using HarmonyLib;
using System.Reflection;
using UnityEngine;
namespace SPT.Custom.Patches
{
/**
* BSG passes the wrong target location into the TryCall method for BotCallForHelp, it's passing in
* the bots current target instead of the target of the bot calling for help
*
* This results in both an NRE, and the called bots target location being wrong
*/
public class BotCallForHelpCallBotPatch : ModulePatch
{
private static FieldInfo _originalPanicTypeField;
protected override MethodBase GetTargetMethod()
{
_originalPanicTypeField = AccessTools.Field(typeof(BotCallForHelp), "_originalPanicType");
return AccessTools.FirstMethod(typeof(BotCallForHelp), IsTargetMethod);
}
protected bool IsTargetMethod(MethodBase method)
{
var parameters = method.GetParameters();
return (parameters.Length == 1
&& parameters[0].Name == "calledBot");
}
[PatchPrefix]
private static bool PatchPrefix(ref bool __result, BotCallForHelp __instance, BotOwner calledBot, BotOwner ___botOwner_0)
{
if (__instance.method_2(calledBot) && ___botOwner_0.Memory.GoalEnemy != null)
{
_originalPanicTypeField.SetValue(calledBot.CallForHelp, calledBot.DangerPointsData.PanicType);
calledBot.DangerPointsData.PanicType = PanicType.none;
calledBot.Brain.BaseBrain.CalcActionNextFrame();
// Note: This differs from BSG's implementation in that we pass in botOwner_0's enemy pos instead of calledBot's enemy pos
calledBot.CalledData.TryCall(new Vector3?(___botOwner_0.Memory.GoalEnemy.Person.Position), ___botOwner_0, true);
__result = true;
}
else
{
__result = false;
}
// Skip original
return false;
}
}
}

6
project/SPT.Custom/Patches/IsEnemyPatch.cs
View File

@ -41,12 +41,6 @@ namespace SPT.Custom.Patches
}
var isEnemy = false; // default not an enemy
if (requester == null)
{
__result = isEnemy;
return false; // Skip original
}
// Check existing enemies list
// Could also check x.Value.Player?.Id - BSG do it this way

1
project/SPT.Custom/SPTCustomPlugin.cs
View File

@ -35,7 +35,6 @@ namespace SPT.Custom
new VersionLabelPatch().Enable();
new IsEnemyPatch().Enable();
new BotCalledDataTryCallPatch().Enable();
new BotCallForHelpCallBotPatch().Enable();
new BotOwnerDisposePatch().Enable();
new LocationLootCacheBustingPatch().Enable();
//new AddSelfAsEnemyPatch().Enable();