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

OnHitEntities now returns a bool and takes a read only list

Browse Source
This commit is contained in:
zumorica
2020-05-21 19:40:08 +02:00
parent 51f06c4142
commit 7cbd2fd8ce
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,8 +75,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
serializer.DataField(ref _cooldownTime, "cooldownTime", 1f);
}
public virtual void OnHitEntities(IEnumerable<IEntity> entities)
public virtual bool OnHitEntities(IReadOnlyList<IEntity> entities)
{
return false;
}
void IAttack.Attack(AttackEventArgs eventArgs)
@@ -105,7 +106,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
}
}
OnHitEntities(hitEntities);
if(OnHitEntities(hitEntities)) return;
var audioSystem = _entitySystemManager.GetEntitySystem<AudioSystem>();
var emitter = hitEntities.Count == 0 ? eventArgs.User : hitEntities[0];

8
Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs
View File

@@ -45,10 +45,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
serializer.DataField(ref _slowdownTime, "slowdownTime", 5f);
}
public override void OnHitEntities(IEnumerable<IEntity> entities)
public override bool OnHitEntities(IReadOnlyList<IEntity> entities)
{
if (!Activated)
return;
if (!Activated || entities.Count == 0)
return false;
_entitySystemManager.GetEntitySystem<AudioSystem>()
.Play("/Audio/weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
@@ -62,6 +62,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
else
stunnable.Slowdown(_slowdownTime);
}
return false;
}
public bool UseEntity(UseEntityEventArgs eventArgs)