tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 00:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix requests not being blocked in bug contest

Browse Source
This commit is contained in:
JappaWakka 2023-01-23 12:12:43 +01:00
parent d3bde7eef0
commit c94f7a2b1b
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
P3D/Overworld/OverworldScreen.vb
View File

@ -318,6 +318,7 @@ Public Class OverworldScreen
''' </summary> ''' </summary>
''' <returns>True, if no requests are in the queue, False otherwise.</returns> ''' <returns>True, if no requests are in the queue, False otherwise.</returns>
Private Function HandleServerRequests() As Boolean Private Function HandleServerRequests() As Boolean
If Screen.Level.IsBugCatchingContest = False Then
If GameJolt.PokegearScreen.BattleRequestData <> -1 Then 'A Servers ID from another player is set here. If GameJolt.PokegearScreen.BattleRequestData <> -1 Then 'A Servers ID from another player is set here.
If Core.ServersManager.PlayerCollection.HasPlayer(GameJolt.PokegearScreen.BattleRequestData) = True Then 'If the player still exists on the server. If Core.ServersManager.PlayerCollection.HasPlayer(GameJolt.PokegearScreen.BattleRequestData) = True Then 'If the player still exists on the server.
Core.SetScreen(New GameJolt.PokegearScreen(Core.CurrentScreen, GameJolt.PokegearScreen.EntryModes.BattleRequest, {GameJolt.PokegearScreen.BattleRequestData, Core.ServersManager.PlayerCollection.GetPlayer(GameJolt.PokegearScreen.BattleRequestData).GameJoltId})) Core.SetScreen(New GameJolt.PokegearScreen(Core.CurrentScreen, GameJolt.PokegearScreen.EntryModes.BattleRequest, {GameJolt.PokegearScreen.BattleRequestData, Core.ServersManager.PlayerCollection.GetPlayer(GameJolt.PokegearScreen.BattleRequestData).GameJoltId}))
@ -334,6 +335,14 @@ Public Class OverworldScreen
GameJolt.PokegearScreen.TradeRequestData = -1 GameJolt.PokegearScreen.TradeRequestData = -1
End If End If
End If End If
Else
If GameJolt.PokegearScreen.BattleRequestData <> -1 Then
GameJolt.PokegearScreen.BattleRequestData = -1
End If
If GameJolt.PokegearScreen.TradeRequestData <> -1 Then
GameJolt.PokegearScreen.TradeRequestData = -1
End If
End If
Return True Return True
End Function End Function