Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reverses order of Thrown Item interactions

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-03-21 18:05:05 +01:00
parent 8d25e5c5de
commit 1a8982da52
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Shared/GameObjects/EntitySystems/ThrownItemSystem.cs
View File

@@ -74,19 +74,6 @@ namespace Content.Shared.GameObjects.EntitySystems
var eventArgs = new ThrowCollideEventArgs(user, thrown.Entity, target.Entity); var eventArgs = new ThrowCollideEventArgs(user, thrown.Entity, target.Entity);
foreach (var comp in thrown.Entity.GetAllComponents<IThrowCollide>())
{
_throwCollide.Add(comp);
}
foreach (var collide in _throwCollide)
{
if (thrown.Entity.Deleted) break;
collide.DoHit(eventArgs);
}
_throwCollide.Clear();
foreach (var comp in target.Entity.GetAllComponents<IThrowCollide>()) foreach (var comp in target.Entity.GetAllComponents<IThrowCollide>())
{ {
_throwCollide.Add(comp); _throwCollide.Add(comp);
@@ -99,6 +86,19 @@ namespace Content.Shared.GameObjects.EntitySystems
} }
_throwCollide.Clear(); _throwCollide.Clear();
foreach (var comp in thrown.Entity.GetAllComponents<IThrowCollide>())
{
_throwCollide.Add(comp);
}
foreach (var collide in _throwCollide)
{
if (thrown.Entity.Deleted) break;
collide.DoHit(eventArgs);
}
_throwCollide.Clear();
} }
} }
} }