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

Make UncivGame.isInitialized inaccessible outside of the class hierarchy (#9651)

Browse Source 
* Make UncivGame.isInitialized inaccessible outside of the class hierarchy

* Fix JvmName
This commit is contained in:
SomeTroglodyte
2023-06-25 08:03:44 +02:00
committed by GitHub
parent a246baa333
commit 650a43aa3b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/src/com/unciv/app/AndroidGame.kt
View File

@ -78,4 +78,5 @@ class AndroidGame(private val activity: Activity) : UncivGame() {
} }
} }
fun isInitializedProxy() = super.isInitialized
} }

2
android/src/com/unciv/app/AndroidLauncher.kt
View File

@ -70,7 +70,7 @@ open class AndroidLauncher : AndroidApplication() {
override fun onPause() { override fun onPause() {
val game = this.game!! val game = this.game!!
if (game.isInitialized if (game.isInitializedProxy()
&& game.gameInfo != null && game.gameInfo != null
&& game.settings.multiplayer.turnCheckerEnabled && game.settings.multiplayer.turnCheckerEnabled
&& game.files.getMultiplayerSaves().any() && game.files.getMultiplayerSaves().any()

4
core/src/com/unciv/UncivGame.kt
View File

@ -137,7 +137,9 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
var worldScreen: WorldScreen? = null var worldScreen: WorldScreen? = null
private set private set
var isInitialized = false /** Flag used only during initialization until the end of [create] */
protected var isInitialized = false
private set
/** A wrapped render() method that crashes to [CrashScreen] on a unhandled exception or error. */ /** A wrapped render() method that crashes to [CrashScreen] on a unhandled exception or error. */
private val wrappedCrashHandlingRender = { super.render() }.wrapCrashHandlingUnit() private val wrappedCrashHandlingRender = { super.render() }.wrapCrashHandlingUnit()