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

Fix for softlocks and other battle bugs

Browse Source
This commit is contained in:
JappaWakka 2023-09-03 16:39:48 +02:00
parent d878559df2
commit d9eb12d341
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -8166,7 +8166,6 @@
If Core.Player.BattleStyle = 1 OrElse BattleScreen.IsPVPBattle = True Then If Core.Player.BattleStyle = 1 OrElse BattleScreen.IsPVPBattle = True Then
BattleScreen.HasSwitchedOwn = False BattleScreen.HasSwitchedOwn = False
StartRound(BattleScreen)
End If End If
End With End With
End If End If

8
P3D/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -327,6 +327,7 @@
If IsPVPBattle = False And IsRemoteBattle = False Then If IsPVPBattle = False And IsRemoteBattle = False Then
PlayerStatistics.Track("Trainer battles", 1) PlayerStatistics.Track("Trainer battles", 1)
Else Else
FieldEffects.Weather = BattleWeather.WeatherTypes.Clear
TempPVPBattleQuery.Clear() TempPVPBattleQuery.Clear()
End If End If
@ -1154,6 +1155,11 @@ nextIndex:
End If End If
End If End If
If BattleQuery.Count = 0 Then
For i = 0 To 99
InsertCasualCameramove()
Next
End If
'Update the world: 'Update the world:
Screen.Level.World.Initialize(Screen.Level.EnvironmentType, World.GetWeatherTypeFromWeather(Screen.Level.World.CurrentMapWeather)) Screen.Level.World.Initialize(Screen.Level.EnvironmentType, World.GetWeatherTypeFromWeather(Screen.Level.World.CurrentMapWeather))
End Sub End Sub
@ -1848,7 +1854,6 @@ nextIndex:
Else Else
BV2Screen.BattleMenu.Visible = True BV2Screen.BattleMenu.Visible = True
End If End If
BV2Screen.TempPVPBattleQuery.Clear()
End Sub End Sub
'Sends some variables that let the client know the current state of the battle 'Sends some variables that let the client know the current state of the battle
@ -1922,6 +1927,7 @@ nextIndex:
End If End If
Core.ServersManager.ServerConnection.SendPackage(New Servers.Package(Servers.Package.PackageTypes.BattleHostData, Core.ServersManager.ID, Servers.Package.ProtocolTypes.TCP, {PartnerNetworkID.ToString(), d}.ToList())) Core.ServersManager.ServerConnection.SendPackage(New Servers.Package(Servers.Package.PackageTypes.BattleHostData, Core.ServersManager.ID, Servers.Package.ProtocolTypes.TCP, {PartnerNetworkID.ToString(), d}.ToList()))
SentHostData = True SentHostData = True
TempPVPBattleQuery.Clear()
End Sub End Sub
#End Region #End Region