AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 11:34:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential crash in console autocomplete (#11568)

Browse Source
This commit is contained in:
SomeTroglodyte 2024-05-11 20:35:57 +02:00 committed by GitHub
parent 0f4b52aaea
commit 7bbe218bf0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/screens/devconsole/DevConsoleCommand.kt
View File

@ -73,9 +73,11 @@ open class ConsoleAction(val format: String, val action: (console: DevConsolePop
it.removeSurrounding("<",">").removeSurrounding("[","]").removeSurrounding("\"") it.removeSurrounding("<",">").removeSurrounding("[","]").removeSurrounding("\"")
} }
if (formatParams.size < params.size) return "" if (formatParams.size < params.size) return ""
val formatParam = formatParams[params.lastIndex] // It is possible we're here *with* another format parameter but an *empty* params (e.g. `tile addriver ` and hit tab) -> see else branch
val (formatParam, lastParam) = if (params.lastIndex in formatParams.indices)
formatParams[params.lastIndex] to params.last()
else formatParams.first() to ""
val lastParam = params.last()
val options = when (formatParam) { val options = when (formatParam) {
"civName" -> console.gameInfo.civilizations.map { it.civName } "civName" -> console.gameInfo.civilizations.map { it.civName }
"unitName" -> console.gameInfo.ruleset.units.keys "unitName" -> console.gameInfo.ruleset.units.keys