diff --git a/P3D/Battle/BattleSystemV2/BattleMenu.vb b/P3D/Battle/BattleSystemV2/BattleMenu.vb index db840b747..e220bddfb 100644 --- a/P3D/Battle/BattleSystemV2/BattleMenu.vb +++ b/P3D/Battle/BattleSystemV2/BattleMenu.vb @@ -316,6 +316,12 @@ End Sub Public Sub Update(ByRef BattleScreen As BattleScreen) + Dim blockinteractscreen() As Screen.Identifications = {Screen.Identifications.PartyScreen, Screen.Identifications.SummaryScreen, Screen.Identifications.PauseScreen, Screen.Identifications.ChatScreen} + If blockinteractscreen.Contains(Core.CurrentScreen.Identification) = True Then + CanInteract = False + Else + CanInteract = True + End If If CanInteract = True Then Select Case MenuState Case MenuStates.Main diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb index 7d056181b..1305657c1 100644 --- a/P3D/Battle/BattleSystemV2/BattleScreen.vb +++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb @@ -1137,10 +1137,17 @@ nextIndex: End If End If - If GameController.IS_DEBUG_ACTIVE = True Or Core.Player.SandBoxMode = True Then - If KeyBoardHandler.KeyPressed(Keys.K) = True Then - Battle.Won = True - EndBattle(False) + Dim canEnd As Boolean = True + Dim blockinteractscreen() As Screen.Identifications = {Screen.Identifications.PartyScreen, Screen.Identifications.SummaryScreen, Screen.Identifications.PauseScreen, Screen.Identifications.ChatScreen} + If blockinteractscreen.Contains(Core.CurrentScreen.Identification) = True Then + canEnd = False + End If + If canEnd = True Then + If GameController.IS_DEBUG_ACTIVE = True Or Core.Player.SandBoxMode = True Then + If KeyBoardHandler.KeyPressed(Keys.K) = True Then + Battle.Won = True + EndBattle(False) + End If End If End If