Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebase fix

Browse Source
This commit is contained in:
danielkenji83 2024-02-17 01:07:55 -03:00
parent 81cfb26059
commit 1c504ea060
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/combat.rs
View File

@ -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,

15
server/src/events/entity_manipulation.rs
View File

@ -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,