Merge pull request #121 from BlackCrawler/fix-crash-#85

Fix another crash (#85)
steamroller-airmash · Jul 31, 2019 · 425709d · 425709d
2 parents 5df9840 + 45b64c8
commit 425709d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/server/src/systems/handlers/game/on_player_powerup/trigger_update.rs b/server/src/systems/handlers/game/on_player_powerup/trigger_update.rs
@@ -13,6 +13,7 @@ pub struct TriggerUpdate;
 #[derive(SystemData)]
 pub struct TriggerUpdateData<'a> {
 	force_update: WriteStorage<'a, ForcePlayerUpdate>,
+	entities: Entities<'a>,
 }
 
 impl EventHandlerTypeProvider for TriggerUpdate {
@@ -23,6 +24,10 @@ impl<'a> EventHandler<'a> for TriggerUpdate {
 	type SystemData = TriggerUpdateData<'a>;
 
 	fn on_event(&mut self, evt: &PlayerPowerup, data: &mut Self::SystemData) {
+		if !data.entities.is_alive(evt.player) {
+			return;
+		}
+
 		data.force_update
 			.insert(evt.player, ForcePlayerUpdate)
 			.unwrap();