kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-04 23:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[RelativeSync] Fixed execution order of RelativeSyncController & PuppetMaster.ProcessAvatarVisibility, so moving at high speeds with passengers does not disrupt voice or avatar distance hider

Browse source
This commit is contained in:
NotAKidoS 2025-04-03 05:08:25 -05:00
parent 063669e8a6
commit ea5a9eef97
5 changed files with 52 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

54
RelativeSync/Patches.cs
View file

@ -2,12 +2,10 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.Networking.Jobs;
using ABI_RC.Core.Player;
using ABI_RC.Systems.Movement;
using ABI.CCK.Components;
using HarmonyLib;
using NAK.RelativeSync.Components;
using NAK.RelativeSync.Networking;
using UnityEngine;
namespace NAK.RelativeSync.Patches;
@ -19,7 +17,6 @@ internal static class PlayerSetupPatches
{
__instance.AddComponentIfMissing<RelativeSyncMonitor>();
}
}
internal static class PuppetMasterPatches
@ -30,6 +27,20 @@ internal static class PuppetMasterPatches
{
__instance.AddComponentIfMissing<RelativeSyncController>();
}
private static bool ShouldProcessAvatarVisibility { get; set; }
[HarmonyPrefix]
[HarmonyPatch(typeof(PuppetMaster), nameof(PuppetMaster.ProcessAvatarVisibility))]
private static bool Prefix_PuppetMaster_ProcessAvatarVisibility()
=> ShouldProcessAvatarVisibility;
public static void ForceProcessAvatarVisibility(PuppetMaster puppetMaster)
{
ShouldProcessAvatarVisibility = true;
puppetMaster.ProcessAvatarVisibility();
ShouldProcessAvatarVisibility = false;
}
}
internal static class CVRSeatPatches
@ -85,29 +96,24 @@ internal static class CVRSpawnablePatches
}
}
internal static class BetterBetterCharacterControllerPatches
internal static class NetIKController_Patches
{
private static bool _noInterpolation;
internal static bool NoInterpolation
{
get => _noInterpolation;
set
{
_noInterpolation = value;
if (_rigidbody == null) return;
_rigidbody.interpolation = value ? RigidbodyInterpolation.None : _initialInterpolation;
}
}
private static Rigidbody _rigidbody;
private static RigidbodyInterpolation _initialInterpolation;
[HarmonyPostfix]
[HarmonyPatch(typeof(BetterBetterCharacterController), nameof(BetterBetterCharacterController.Start))]
private static void Postfix_BetterBetterCharacterController_Update(ref BetterBetterCharacterController __instance)
[HarmonyPatch(typeof(NetIKController), nameof(NetIKController.LateUpdate))]
private static void Postfix_NetIKController_LateUpdate(ref NetIKController __instance)
{
_rigidbody = __instance.GetComponent<Rigidbody>();
_initialInterpolation = _rigidbody.interpolation;
NoInterpolation = _noInterpolation; // get initial value as patch runs later than settings init
if (!RelativeSyncManager.NetIkControllersToRelativeSyncControllers.TryGetValue(__instance,
out RelativeSyncController syncController))
{
// Process visibility only after applying network IK
PuppetMasterPatches.ForceProcessAvatarVisibility(__instance._puppetMaster);
return;
}
// Apply relative sync after the network IK has been applied
syncController.OnPostNetIkControllerLateUpdate();
// Process visibility after we have moved the remote player
PuppetMasterPatches.ForceProcessAvatarVisibility(__instance._puppetMaster);
}
}