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

Fix projectile issue.

Browse Source
This commit is contained in:
Sardelka
2022-06-16 11:57:48 +08:00
parent 1c981c331c
commit 7f1891236d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RageCoop.Client/Sync/Entities/SyncedProjectile.cs
View File

@ -13,13 +13,17 @@ namespace RageCoop.Client
public SyncedProjectile(Projectile p) public SyncedProjectile(Projectile p)
{ {
ID=EntityPool.RequestNewID(); ID=EntityPool.RequestNewID();
IsMine=true;
MainProjectile = p; MainProjectile = p;
Origin=p.Position; Origin=p.Position;
var shooter = EntityPool.GetPedByHandle((p.Owner?.Handle).GetValueOrDefault()); var shooter = EntityPool.GetPedByHandle((p.Owner?.Handle).GetValueOrDefault());
if(shooter != null) if(shooter != null)
{ {
if (shooter.MainPed!=null && (p.AttachedEntity==shooter.MainPed.Weapons.CurrentWeaponObject || p.AttachedEntity== shooter.MainPed))
{
IsValid=false;
}
ShooterID=shooter.ID; ShooterID=shooter.ID;
IsMine=shooter.IsMine;
} }
else else
{ {
@ -34,14 +38,15 @@ namespace RageCoop.Client
Main.Logger.Warning($"Could not find owner for projectile:{Hash}"); Main.Logger.Warning($"Could not find owner for projectile:{Hash}");
} }
} }
} }
public SyncedProjectile(int id) public SyncedProjectile(int id)
{ {
ID= id; ID= id;
IsMine=false; IsMine=false;
} }
public new bool IsMine { get; private set; } public bool IsValid { get; private set; } = true;
public new bool IsMine { get; private set; } = false;
public bool Exploded { get; set; } = false; public bool Exploded { get; set; } = false;
public Projectile MainProjectile { get; set; } public Projectile MainProjectile { get; set; }
public int ShooterID { get; set; } public int ShooterID { get; set; }

1
RageCoop.Client/Sync/EntityPool.cs
View File

@ -226,6 +226,7 @@ namespace RageCoop.Client
} }
public static void Add(SyncedProjectile p) public static void Add(SyncedProjectile p)
{ {
if (!p.IsValid) { return; }
if (ID_Projectiles.ContainsKey(p.ID)) if (ID_Projectiles.ContainsKey(p.ID))
{ {
ID_Projectiles[p.ID]=p; ID_Projectiles[p.ID]=p;