curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 04:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: imported avatars trigger NPE on UILoadManage

Browse Source
This commit is contained in:
minjaesong
2023-10-06 15:05:47 +09:00
parent 781f671859
commit 0e21f28609
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -941,8 +941,8 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
uiContainer.forEach { uiContainer.forEach {
when (it) { when (it) {
is UICanvas -> it.update(Gdx.graphics.deltaTime)
is Id_UICanvasNullable -> it.get()?.update(Gdx.graphics.deltaTime) is Id_UICanvasNullable -> it.get()?.update(Gdx.graphics.deltaTime)
is UICanvas -> it.update(Gdx.graphics.deltaTime)
} }
} }
//uiFixture?.update(Gdx.graphics.deltaTime) //uiFixture?.update(Gdx.graphics.deltaTime)

1
src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalEmitter.kt
View File

@@ -19,6 +19,7 @@ class ItemLogicSignalEmitter(originalID: ItemID) : FixtureItemBase(originalID, "
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_LOGIC_SIGNAL_EMITTER" override var originalName = "ITEM_LOGIC_SIGNAL_EMITTER"
override var inventoryCategory = Category.MISC
override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) { override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {
super.effectWhileEquipped(actor, delta) super.effectWhileEquipped(actor, delta)

2
src/net/torvald/terrarum/modulebasegame/ui/UILoadManage.kt
View File

@@ -271,7 +271,7 @@ class UILoadManage(val full: UILoadSavegame) : UICanvas() {
it.mapIndexed { index, s -> "${(index+1).toString().padStart(it.size.fastLen())}. $s" } it.mapIndexed { index, s -> "${(index+1).toString().padStart(it.size.fastLen())}. $s" }
} ?: listOf("$EMDASH") } ?: listOf("$EMDASH")
loadOrderWorld = loadOrderWorld =
App.savegameWorlds[full.playerButtonSelected!!.worldUUID]!!.files[selectedRevision].getFile( App.savegameWorlds[full.playerButtonSelected!!.worldUUID]?.files?.get(selectedRevision)?.getFile( // it's null for freshly-imported avatars
VDFileID.LOADORDER VDFileID.LOADORDER
)?.getContent()?.toByteArray()?.toString(Common.CHARSET)?.split('\n')?.let { )?.getContent()?.toByteArray()?.toString(Common.CHARSET)?.split('\n')?.let {
it.mapIndexed { index, s -> "${(index+1).toString().padStart(it.size.fastLen())}. $s" } it.mapIndexed { index, s -> "${(index+1).toString().padStart(it.size.fastLen())}. $s" }