Merge branch 'master' into dev

This commit is contained in:
Maruno17
2021-02-08 18:38:54 +00:00
6 changed files with 10 additions and 8 deletions

View File

@@ -1661,7 +1661,7 @@ BattleHandlers::UserAbilityEndOfMove.add(:BEASTBOOST,
BattleHandlers::UserAbilityEndOfMove.add(:MAGICIAN,
proc { |ability,user,targets,move,battle|
next if !battle.futureSight
next if battle.futureSight
next if !move.pbDamagingMove?
next if user.item
next if battle.wildBattle? && user.opposes?