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

fix: biomegen may fail due to uninitialised whatever

Browse Source
This commit is contained in:
minjaesong
2024-01-21 00:32:48 +09:00
parent aada6e891c
commit ff3f8fe7e3
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/net/torvald/terrarum/modulebasegame/worldgenerator/Biomegen.kt
View File

@@ -23,17 +23,10 @@ class Biomegen(world: GameWorld, isFinal: Boolean, seed: Long, params: Any, val
private val YHEIGHT_DIVISOR = 2.0 / 7.0
private lateinit var THISWORLD_SAND: ItemID
private lateinit var THISWORLD_SANDSTONE: ItemID
override fun getDone(loadscreen: LoadScreenBase?) {
loadscreen?.let {
it.stageValue += 1
it.progress.set(0L)
}
private val THISWORLD_SAND: ItemID
private val THISWORLD_SANDSTONE: ItemID
init {
val SAND_RND = (seed shake "SANDYCOLOURS").ushr(7).xor(seed and 255L).and(255L).toInt()
val SAND_BASE = when (SAND_RND) {
255 -> 5 // green
@@ -44,8 +37,16 @@ class Biomegen(world: GameWorld, isFinal: Boolean, seed: Long, params: Any, val
}
THISWORLD_SAND = "basegame:" + (Block.SAND.substringAfter(':').toInt() + SAND_BASE)
THISWORLD_SANDSTONE = "basegame:" + (Block.SANDSTONE.substringAfter(':').toInt() + SAND_BASE)
}
override fun getDone(loadscreen: LoadScreenBase?) {
loadscreen?.let {
it.stageValue += 1
it.progress.set(0L)
}
// loadscreen.progress.set((loadscreen.progress.get() + 0x1_000000_000000L) and 0x7FFF_000000_000000L)
Worldgen.threadExecutor.renew()