Merge branch 'aws107/roll-to-remove-burning' into 'master'

Implement #1105: Rolling removes burning debuff

Closes #1105

See merge request veloren/veloren!2271
This commit is contained in:
Samuel Keiffer 2021-05-10 02:40:08 +00:00
commit 6c9a2663ba

View File

@ -1,5 +1,9 @@
use crate::{
comp::{CharacterState, InputKind, StateUpdate},
comp::{
buff::{BuffChange, BuffKind},
CharacterState, InputKind, StateUpdate,
},
event::ServerEvent,
states::{
behavior::{CharacterBehavior, JoinData},
utils::*,
@ -62,6 +66,11 @@ impl CharacterBehavior for Data {
..*self
});
} else {
// Remove burning effect if active
update.server_events.push_front(ServerEvent::Buff {
entity: data.entity,
buff_change: BuffChange::RemoveByKind(BuffKind::Burning),
});
// Transitions to movement section of stage
update.character = CharacterState::Roll(Data {
timer: Duration::default(),