mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Rebase fix
This commit is contained in:
parent
81cfb26059
commit
1c504ea060
@ -150,7 +150,7 @@ impl Attack {
|
||||
damage: Damage,
|
||||
msm: &MaterialStatManifest,
|
||||
time: Time,
|
||||
emitters: &mut impl EmitExt<ParryHookEvent>,
|
||||
emitters: &mut (impl EmitExt<ParryHookEvent> + EmitExt<PoiseChangeEvent>),
|
||||
mut emit_outcome: impl FnMut(Outcome),
|
||||
) -> f32 {
|
||||
if damage.value > 0.0 {
|
||||
@ -182,7 +182,7 @@ impl Attack {
|
||||
attacker: attacker.map(|a| a.entity),
|
||||
source,
|
||||
});
|
||||
emit(ServerEvent::PoiseChange {
|
||||
emitters.emit(PoiseChangeEvent {
|
||||
entity: target.entity,
|
||||
change: PoiseChange {
|
||||
amount: -poise_change,
|
||||
@ -208,7 +208,7 @@ impl Attack {
|
||||
pos: target.pos,
|
||||
uid: target.uid,
|
||||
});
|
||||
emit(ServerEvent::PoiseChange {
|
||||
emitters.emit(PoiseChangeEvent {
|
||||
entity: target.entity,
|
||||
change: PoiseChange {
|
||||
amount: -poise_change,
|
||||
|
@ -820,13 +820,13 @@ impl ServerEvent for LandOnGroundEvent {
|
||||
let change = damage.calculate_health_change(
|
||||
damage_reduction,
|
||||
0.0,
|
||||
None,
|
||||
None,
|
||||
0.0,
|
||||
1.0,
|
||||
*time,
|
||||
rand::random(),
|
||||
);
|
||||
None,
|
||||
None,
|
||||
0.0,
|
||||
1.0,
|
||||
*time,
|
||||
rand::random(),
|
||||
);
|
||||
|
||||
health_change_emitter.emit(HealthChangeEvent {
|
||||
entity: ev.entity,
|
||||
@ -1402,6 +1402,7 @@ pub fn emit_effect_events(
|
||||
common::effect::Effect::Damage(damage) => {
|
||||
let change = damage.calculate_health_change(
|
||||
combat::Damage::compute_damage_reduction(Some(damage), inventory, stats, msm),
|
||||
0.0,
|
||||
damage_contributor,
|
||||
None,
|
||||
0.0,
|
||||
|
Loading…
Reference in New Issue
Block a user