Deukhoofd/PkmnLib_rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for newer Rust nightly
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2023-01-02 10:41:57 +01:00
parent 0a4d44646c
commit 27b0a460ad
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dynamic_data/models/pokemon.rs
View File

@@ -600,7 +600,7 @@ impl Pokemon {
/// Whether or not the Pokemon is on the battlefield.
pub fn is_on_battlefield(&self) -> bool {
self.battle_data.read().is_some_and(|a| a.on_battle_field())
self.battle_data.read().as_ref().is_some_and(|a| a.on_battle_field())
}
/// Marks an opponent as seen, for use in experience gain.
@@ -636,7 +636,7 @@ impl Pokemon {
});
}
}
if self.battle_data.read().is_some_and(|a| a.on_battle_field()) {
if self.battle_data.read().as_ref().is_some_and(|a| a.on_battle_field()) {
script_hook!(on_damage, self, self, source, self.current_health(), new_health);
}