Fixed Cramorant not reverting form after coughing up a Gulp Missle, fixed crash when a phone contact calls when you're on a map with no metadata

This commit is contained in:
Maruno17
2023-09-10 16:57:09 +01:00
parent 8f00307685
commit bc18aa95f2
2 changed files with 2 additions and 1 deletions

View File

@@ -18,6 +18,7 @@ class Battle::Battler
# target Cramorant attacking the user) and the ability splash
# shouldn't be shown.
@battle.pbShowAbilitySplash(target)
target.pbChangeForm(0, nil)
if user.takesIndirectDamage?(Battle::Scene::USE_ABILITY_SPLASH)
@battle.scene.pbDamageAnimation(user)
user.pbReduceHP(user.totalhp / 4, false)

View File

@@ -320,7 +320,7 @@ class Phone
module_function
def can_make?
return false if $game_map.metadata.has_flag?("NoPhoneSignal")
return false if $game_map.metadata&.has_flag?("NoPhoneSignal")
return true
end