mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 13:18:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Silly multithreading movement problems should no longer crash the game for the user - they're rare, but when you have 50,000 users they pop up every day.

Browse Source
This commit is contained in:
Yair Morgenstern
2019-12-09 18:48:48 +02:00
parent 32ac709a02
commit caf98b8470
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 29 targetSdkVersion 29
versionCode 338 versionCode 339
versionName "3.3.6" versionName "3.3.7"
archivesBaseName = "Unciv" archivesBaseName = "Unciv"
} }

8
core/src/com/unciv/ui/worldscreen/unit/UnitContextMenu.kt
View File

@ -59,8 +59,12 @@ class UnitContextMenu(val tileMapHolder: TileMapHolder, val selectedUnit: MapUni
// this can take a long time, because of the unit-to-tile calculation needed, so we put it in a different thread // this can take a long time, because of the unit-to-tile calculation needed, so we put it in a different thread
thread { thread {
// these are the heavy parts, finding where we want to go // these are the heavy parts, finding where we want to go
if (!selectedUnit.movement.canReach(targetTile)) return@thread // can't move here // Since this runs in a different thread, even if we check movement.canReach()
val tileToMoveTo = selectedUnit.movement.getTileToMoveToThisTurn(targetTile) // then it might change until we get to the getTileToMoveTo, so we just try/catch it
val tileToMoveTo:TileInfo
try{
tileToMoveTo = selectedUnit.movement.getTileToMoveToThisTurn(targetTile)
}catch (ex:Exception){ return@thread } // can't move here
Gdx.app.postRunnable { Gdx.app.postRunnable {
try { try {