diff --git a/Client/Installer/MainWindow.xaml.cs b/Client/Installer/MainWindow.xaml.cs index 66bfbab..38cfbe9 100644 --- a/Client/Installer/MainWindow.xaml.cs +++ b/Client/Installer/MainWindow.xaml.cs @@ -53,7 +53,7 @@ namespace RageCoop.Client.Installer { UpdateStatus("Checking requirements"); var shvPath = Path.Combine(root, "ScriptHookV.dll"); - var shvdnPath = Path.Combine(root, "ScriptHookVDotNet3.dll"); + var shvdnPath = Path.Combine(root, "ScriptHookVDotNetCore.dll"); var scriptsPath = Path.Combine(root, "Scripts"); var installPath = Path.Combine(root, "RageCoop"); var legacyPath = Path.Combine(scriptsPath, "RageCoop"); diff --git a/Client/Scripts/Sync/SyncEvents.cs b/Client/Scripts/Sync/SyncEvents.cs index 5ec52ba..ea64402 100644 --- a/Client/Scripts/Sync/SyncEvents.cs +++ b/Client/Scripts/Sync/SyncEvents.cs @@ -156,10 +156,12 @@ namespace RageCoop.Client return true; } + var vehWeap = subject.VehicleWeapon; + // Not found, but it's shot from a vehicle - if (subject.VehicleWeapon != VehicleWeaponHash.Invalid) + if (vehWeap != VehicleWeaponHash.Invalid) { - var b = c.GetMuzzleBone(true); + var b = c.MainPed.CurrentVehicle.GetMuzzleBone(vehWeap); TriggerBulletShot(c, b.Position + b.ForwardVector * 200); return true; } diff --git a/libs/ScriptHookVDotNetCore b/libs/ScriptHookVDotNetCore index 72fd661..43df04d 160000 --- a/libs/ScriptHookVDotNetCore +++ b/libs/ScriptHookVDotNetCore @@ -1 +1 @@ -Subproject commit 72fd66130e5b07f24a4a625b1a087d9e4b377d16 +Subproject commit 43df04d914cab4360e93c75127d4b0cf6be25329