tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AfterAttack with an EventArg object for a parameter

Browse Source
This commit is contained in:
PrPleGoo
2019-04-05 19:40:46 +02:00
parent 9b2be2ba50
commit 7d85141c9b
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
View File

@@ -32,15 +32,15 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
serializer.DataField(ref ArcWidth, "arcwidth", 90);
}
void IAfterAttack.Afterattack(IEntity user, GridCoordinates clicklocation, IEntity attacked)
void IAfterAttack.AfterAttack(AfterAttackEventArgs eventArgs)
{
var location = user.GetComponent<ITransformComponent>().GridPosition;
var angle = new Angle(clicklocation.ToWorld().Position - location.ToWorld().Position);
var entities = IoCManager.Resolve<IServerEntityManager>().GetEntitiesInArc(user.GetComponent<ITransformComponent>().GridPosition, Range, angle, ArcWidth);
var location = eventArgs.User.GetComponent<ITransformComponent>().GridPosition;
var angle = new Angle(eventArgs.ClickLocation.ToWorld().Position - location.ToWorld().Position);
var entities = IoCManager.Resolve<IServerEntityManager>().GetEntitiesInArc(eventArgs.User.GetComponent<ITransformComponent>().GridPosition, Range, angle, ArcWidth);
foreach (var entity in entities)
{
if (!entity.GetComponent<ITransformComponent>().IsMapTransform || entity == user)
if (!entity.GetComponent<ITransformComponent>().IsMapTransform || entity == eventArgs.User)
continue;
if (entity.TryGetComponent(out DamageableComponent damagecomponent))