Merge branch 'shandley/bugfix-stats-audio-event' into 'master'

(fix) Remove emission of an audio event from stats sys

See merge request veloren/veloren!714
This commit is contained in:
Imbris 2020-01-11 04:49:43 +00:00
commit d72aeccf50

View File

@ -1,6 +1,6 @@
use crate::{
comp::{HealthSource, Stats},
event::{EventBus, ServerEvent, SfxEvent, SfxEventItem},
event::{EventBus, ServerEvent},
state::DeltaTime,
};
use specs::{Entities, Join, Read, System, WriteStorage};
@ -13,14 +13,10 @@ impl<'a> System<'a> for Sys {
Entities<'a>,
Read<'a, DeltaTime>,
Read<'a, EventBus<ServerEvent>>,
Read<'a, EventBus<SfxEventItem>>,
WriteStorage<'a, Stats>,
);
fn run(
&mut self,
(entities, dt, server_event_bus, audio_event_bus, mut stats): Self::SystemData,
) {
fn run(&mut self, (entities, dt, server_event_bus, mut stats): Self::SystemData) {
let mut server_event_emitter = server_event_bus.emitter();
// Increment last change timer
@ -58,10 +54,6 @@ impl<'a> System<'a> for Sys {
stat.level.change_by(1);
}
audio_event_bus
.emitter()
.emit(SfxEventItem::at_player_position(SfxEvent::LevelUp));
stat.update_max_hp();
stat.health
.set_to(stat.health.maximum(), HealthSource::LevelUp)