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

Two muzzles fix

Browse Source
This commit is contained in:
Sardelka
2022-06-02 13:52:18 +08:00
parent 2c6f0dbe3d
commit 051b496021
5 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Client/Sync/SyncEvents.cs
View File

@ -188,7 +188,7 @@ namespace RageCoop.Client {
_lastWeaponHash=weaponHash;
}
if (!_weaponAsset.IsLoaded) { _weaponAsset.Request(); }
World.ShootBullet(start, end, p, _weaponAsset, p.GetWeaponDamage());
World.ShootBullet(start, end, p, _weaponAsset, p.GetWeaponDamage(weaponHash));
Prop w;
if(((w = p.Weapons.CurrentWeaponObject) != null)&&(p.VehicleWeapon==VehicleWeaponHash.Invalid))
{
@ -269,10 +269,12 @@ namespace RageCoop.Client {
}
}
}
public static int GetWeaponDamage(this Ped p)
public static int GetWeaponDamage(this Ped p,uint hash)
{
if (p.VehicleWeapon!=VehicleWeaponHash.Invalid)
if(p.IsInVehicle() && (hash!=(uint)p.Weapons.Current.Hash))
{
// This is a vehicle weapon
p.VehicleWeapon=(VehicleWeaponHash)hash;
return 100;
}
switch (p.Weapons.Current.Group)