mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 05:34:58 +00:00
Fixed crash when a foe trainer tries to replace a caught Shadow Pokémon, fixed Hall of Fame not remembering entries
This commit is contained in:
@@ -61,6 +61,7 @@ class PokeBattle_RealBattlePeer
|
||||
|
||||
# For switching out, including due to fainting, and for the end of battle
|
||||
def pbOnLeavingBattle(battle,pkmn,usedInBattle,endBattle=false)
|
||||
return if !pkmn
|
||||
f = MultipleForms.call("getFormOnLeavingBattle",pkmn,battle,usedInBattle,endBattle)
|
||||
pkmn.form = f if f && pkmn.form!=f
|
||||
pkmn.hp = pkmn.totalhp if pkmn.hp>pkmn.totalhp
|
||||
|
||||
@@ -486,7 +486,8 @@ class PokemonGlobalMetadata
|
||||
attr_writer :hallOfFameLastNumber
|
||||
|
||||
def hallOfFame
|
||||
return @hallOfFame || []
|
||||
@hallOfFame = [] if !@hallOfFame
|
||||
return @hallOfFame
|
||||
end
|
||||
|
||||
def hallOfFameLastNumber
|
||||
|
||||
Reference in New Issue
Block a user