Invisible player should not be added again
This commit is contained in:
+1
-1
@@ -563,7 +563,7 @@ mod tests {
|
|||||||
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
|
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
|
||||||
assert_eq!(player_stats.damage, 0.0);
|
assert_eq!(player_stats.damage, 0.0);
|
||||||
|
|
||||||
character_enters!(meter, "CH1", 1);
|
character_enters!(meter, "CH1", 2);
|
||||||
let zone_stats = stats(&meter, StatType::Zone);
|
let zone_stats = stats(&meter, StatType::Zone);
|
||||||
let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
|
let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
|
||||||
assert_eq!(player_stats.damage, 0.0);
|
assert_eq!(player_stats.damage, 0.0);
|
||||||
|
|||||||
@@ -158,6 +158,7 @@ impl Meter {
|
|||||||
let session = self.zone_session_mut()?;
|
let session = self.zone_session_mut()?;
|
||||||
session.add_player(name, id);
|
session.add_player(name, id);
|
||||||
self.last_fight_session.add_player(name, id);
|
self.last_fight_session.add_player(name, id);
|
||||||
|
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -261,7 +262,9 @@ impl PlayerEvents for Meter {
|
|||||||
self.new_session();
|
self.new_session();
|
||||||
}
|
}
|
||||||
|
|
||||||
self.add_player(name, id);
|
if self.get_damage_dealers_in_zone(id).unwrap_or(vec![]).is_empty() {
|
||||||
|
self.add_player(name, id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn register_combat_enter(&mut self, player_id: usize) -> Option<()> {
|
fn register_combat_enter(&mut self, player_id: usize) -> Option<()> {
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ def player_style(items):
|
|||||||
elif weapon_type == weapon.WeaponType.Spear:
|
elif weapon_type == weapon.WeaponType.Spear:
|
||||||
return Style(bg = '#a9a9a9')
|
return Style(bg = '#a9a9a9')
|
||||||
elif weapon_type == weapon.WeaponType.Sword:
|
elif weapon_type == weapon.WeaponType.Sword:
|
||||||
return Style(bg = '#ffe119')
|
return Style(bg = '#b59d00')
|
||||||
else:
|
else:
|
||||||
return Style(bg = '#42413c')
|
return Style(bg = '#42413c')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user