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

super simple new character window

Browse Source
This commit is contained in:
minjaesong
2021-12-09 16:58:26 +09:00
parent 3c4e169743
commit 44d6d84bbd
8 changed files with 160 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/torvald/terrarum/serialise/WriteActor.kt
View File

@@ -9,6 +9,7 @@ import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
import net.torvald.terrarum.savegame.*
import java.io.Reader
import java.util.*
/**
* Created by minjaesong on 2021-08-24.
@@ -57,19 +58,19 @@ object WritePlayer {
if (!dir.contains(file.entryID)) dir.add(file.entryID)
}
operator fun invoke(player: IngamePlayer, playerDisk: VirtualDisk, ingame: TerrarumIngame, time_t: Long) {
operator fun invoke(player: IngamePlayer, playerDisk: VirtualDisk, ingame: TerrarumIngame?, time_t: Long) {
player.lastPlayTime = time_t
player.totalPlayTime += time_t - ingame.loadedTime_t
player.totalPlayTime += time_t - (ingame?.loadedTime_t ?: time_t)
// restore player prop backup created on load-time for multiplayer
if (ingame.isMultiplayer) {
if (ingame?.isMultiplayer == true) {
player.setPosition(player.unauthorisedPlayerProps.physics.position)
player.actorValue = player.unauthorisedPlayerProps.actorValue!!
player.inventory = player.unauthorisedPlayerProps.inventory!!
}
player.worldCurrentlyPlaying = ingame.world.worldIndex
player.worldCurrentlyPlaying = ingame?.world?.worldIndex ?: UUID(0L,0L)
val actorJson = WriteActor.encodeToByteArray64(player)