tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-27 15:54:25 +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

31
P3D/Overworld/OverworldScreen.vb
View File

@ -318,19 +318,28 @@ 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 GameJolt.PokegearScreen.BattleRequestData <> -1 Then 'A Servers ID from another player is set here. If Screen.Level.IsBugCatchingContest = False Then
If Core.ServersManager.PlayerCollection.HasPlayer(GameJolt.PokegearScreen.BattleRequestData) = True Then 'If the player still exists on the server. If GameJolt.PokegearScreen.BattleRequestData <> -1 Then 'A Servers ID from another player is set here.
Core.SetScreen(New GameJolt.PokegearScreen(Core.CurrentScreen, GameJolt.PokegearScreen.EntryModes.BattleRequest, {GameJolt.PokegearScreen.BattleRequestData, Core.ServersManager.PlayerCollection.GetPlayer(GameJolt.PokegearScreen.BattleRequestData).GameJoltId})) If Core.ServersManager.PlayerCollection.HasPlayer(GameJolt.PokegearScreen.BattleRequestData) = True Then 'If the player still exists on the server.
Return False Core.SetScreen(New GameJolt.PokegearScreen(Core.CurrentScreen, GameJolt.PokegearScreen.EntryModes.BattleRequest, {GameJolt.PokegearScreen.BattleRequestData, Core.ServersManager.PlayerCollection.GetPlayer(GameJolt.PokegearScreen.BattleRequestData).GameJoltId}))
Else 'Otherwise, reset the data. Return False
Else 'Otherwise, reset the data.
GameJolt.PokegearScreen.BattleRequestData = -1
End If
End If
If GameJolt.PokegearScreen.TradeRequestData <> -1 Then 'A Servers ID from another player is set here.
If Core.ServersManager.PlayerCollection.HasPlayer(GameJolt.PokegearScreen.TradeRequestData) = True Then 'If the player still exists on the server.
Core.SetScreen(New GameJolt.PokegearScreen(Core.CurrentScreen, GameJolt.PokegearScreen.EntryModes.TradeRequest, {GameJolt.PokegearScreen.TradeRequestData, Core.ServersManager.PlayerCollection.GetPlayer(GameJolt.PokegearScreen.TradeRequestData).GameJoltId}))
Return False
Else 'Otherwise, reset the data.
GameJolt.PokegearScreen.TradeRequestData = -1
End If
End If
Else
If GameJolt.PokegearScreen.BattleRequestData <> -1 Then
GameJolt.PokegearScreen.BattleRequestData = -1 GameJolt.PokegearScreen.BattleRequestData = -1
End If End If
End If If GameJolt.PokegearScreen.TradeRequestData <> -1 Then
If GameJolt.PokegearScreen.TradeRequestData <> -1 Then 'A Servers ID from another player is set here.
If Core.ServersManager.PlayerCollection.HasPlayer(GameJolt.PokegearScreen.TradeRequestData) = True Then 'If the player still exists on the server.
Core.SetScreen(New GameJolt.PokegearScreen(Core.CurrentScreen, GameJolt.PokegearScreen.EntryModes.TradeRequest, {GameJolt.PokegearScreen.TradeRequestData, Core.ServersManager.PlayerCollection.GetPlayer(GameJolt.PokegearScreen.TradeRequestData).GameJoltId}))
Return False
Else 'Otherwise, reset the data.
GameJolt.PokegearScreen.TradeRequestData = -1 GameJolt.PokegearScreen.TradeRequestData = -1
End If End If
End If End If