curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-16 16:46:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: imported avatars wont show up on players list until the game is restarted

Browse Source
This commit is contained in:
minjaesong
2023-10-06 16:17:24 +09:00
parent 0e21f28609
commit bfa6cbe2da
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/terrarum/modulebasegame/ui/UIImportAvatar.kt
View File

@@ -8,6 +8,7 @@ import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.App.printdbg import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.App.printdbgerr
import net.torvald.terrarum.gamecontroller.* import net.torvald.terrarum.gamecontroller.*
import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.savegame.* import net.torvald.terrarum.savegame.*
@@ -20,6 +21,7 @@ import net.torvald.terrarum.utils.JsonFetcher
import net.torvald.terrarum.utils.OpenFile import net.torvald.terrarum.utils.OpenFile
import java.awt.Desktop import java.awt.Desktop
import java.io.File import java.io.File
import java.util.UUID
/** /**
* Created by minjaesong on 2023-08-24. * Created by minjaesong on 2023-08-24.
@@ -200,7 +202,9 @@ class UIImportAvatar(val remoCon: UIRemoCon) : Advanceable() {
val it = DiskSkimmer(newFile, true) val it = DiskSkimmer(newFile, true)
val collection = SavegameCollection.collectFromBaseFilename(File(App.playersDir), it.diskFile.name) val collection = SavegameCollection.collectFromBaseFilename(File(App.playersDir), it.diskFile.name)
val playerUUID = collection.getUUID() val playerUUID = UUID.fromString(uuid)
printdbg(this, "${filenameInput} existed before: ${App.savegamePlayers.contains(playerUUID)}")
// if multiple valid savegames with same UUID exist, only the most recent one is retained // if multiple valid savegames with same UUID exist, only the most recent one is retained
if (!App.savegamePlayers.contains(playerUUID)) { if (!App.savegamePlayers.contains(playerUUID)) {
@@ -209,7 +213,9 @@ class UIImportAvatar(val remoCon: UIRemoCon) : Advanceable() {
App.savegamePlayersName[playerUUID] = it.getDiskName(Common.CHARSET) App.savegamePlayersName[playerUUID] = it.getDiskName(Common.CHARSET)
} }
} }
catch (_: Throwable) {} catch (e: Throwable) {
printdbgerr(this, e.stackTraceToString())
}
} }
catch (e: Throwable) { catch (e: Throwable) {
// format error // format error