From 0022bf74556f39ca81042c1bf31fe06c9b8ffdcd Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Tue, 28 Jan 2025 09:10:27 +0100 Subject: [PATCH] Fix crash if selecting disabled move --- P3D/Battle/BattleSystemV2/BattleMenu.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/P3D/Battle/BattleSystemV2/BattleMenu.vb b/P3D/Battle/BattleSystemV2/BattleMenu.vb index 6fd5a7a87..fe07973e2 100644 --- a/P3D/Battle/BattleSystemV2/BattleMenu.vb +++ b/P3D/Battle/BattleSystemV2/BattleMenu.vb @@ -534,7 +534,7 @@ If MouseHandler.IsInRectangle(New Rectangle(Core.windowSize.Width - 255, 116 + Index * 96, 255, 80)) = True Then If isSelected = True Then SoundManager.PlaySound("select") - If Me.Move.Disabled = 0 AndAlso BattleScreen.FieldEffects.OwnEncore = 0 OrElse BattleScreen.FieldEffects.OwnEncoreMove.ID = Move.ID Then + If Me.Move.Disabled = 0 AndAlso BattleScreen.FieldEffects.OwnEncore = 0 OrElse BattleScreen.FieldEffects.OwnEncoreMove IsNot Nothing AndAlso BattleScreen.FieldEffects.OwnEncoreMove.ID = Move.ID Then Me.ClickAction(BattleScreen) End If Else