Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't throw if muzzle bone was not found

Browse Source
This commit is contained in:
Sardelka9515
2023-03-19 15:22:38 +08:00
parent 713e005975
commit 7e019cc112
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Client/Scripts/Sync/SyncEvents.cs
View File

@ -84,7 +84,11 @@ namespace RageCoop.Client
var vehWeap = p.VehicleWeapon; var vehWeap = p.VehicleWeapon;
bool isVeh = vehWeap != VehicleWeaponHash.Invalid; bool isVeh = vehWeap != VehicleWeaponHash.Invalid;
var bone = isVeh ? c.MainPed.CurrentVehicle.GetMuzzleBone(vehWeap) : c.MainPed.GetMuzzleBone(); var bone = isVeh ? c.MainPed.CurrentVehicle.GetMuzzleBone(vehWeap) : c.MainPed.GetMuzzleBone();
if (bone == null)
{
Log.Warning($"Failed to find muzzle bone for {(isVeh ? vehWeap : (WeaponHash)weaponHash)}, {(isVeh ? p.CurrentVehicle.DisplayName : "")}");
return;
}
World.ShootBullet(bone.Position, end, p, asset, damage); World.ShootBullet(bone.Position, end, p, asset, damage);
World.CreateParticleEffectNonLooped(CorePFXAsset, World.CreateParticleEffectNonLooped(CorePFXAsset,
@ -165,7 +169,13 @@ namespace RageCoop.Client
// Veh weapon sync // Veh weapon sync
if (endPos == default) if (endPos == default)
{ {
var b = c.MainPed.CurrentVehicle.GetMuzzleBone(vehWeap); var veh = c.MainPed.CurrentVehicle;
var b = veh.GetMuzzleBone(vehWeap);
if (b == null)
{
Log.Warning($"Failed to find muzzle bone for {vehWeap}, {veh.DisplayName}");
return true;
}
endPos = b.Position + b.ForwardVector * 200; endPos = b.Position + b.ForwardVector * 200;
} }
Networking.SendBullet(c.ID, (uint)vehWeap, endPos); Networking.SendBullet(c.ID, (uint)vehWeap, endPos);