DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Stop objects from popping out of existence if they reside on chunk border and border chunk haven't loaded yet

Browse Source
This commit is contained in:
DBotThePony 2024-04-25 16:37:16 +07:00
parent ba0db89dcf
commit b6ff323e5a
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/Anchor.kt
View File

@ -3,12 +3,16 @@ package ru.dbotthepony.kstarbound.defs.`object`
import ru.dbotthepony.kstarbound.math.vector.Vector2i import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.defs.tile.TileDefinition import ru.dbotthepony.kstarbound.defs.tile.TileDefinition
import ru.dbotthepony.kstarbound.defs.tile.isNullTile
import ru.dbotthepony.kstarbound.world.World import ru.dbotthepony.kstarbound.world.World
data class Anchor(val isBackground: Boolean, val position: Vector2i, val isTilled: Boolean, val isSoil: Boolean, val anchorMaterial: Registry.Ref<TileDefinition>?) { data class Anchor(val isBackground: Boolean, val position: Vector2i, val isTilled: Boolean, val isSoil: Boolean, val anchorMaterial: Registry.Ref<TileDefinition>?) {
fun isValidPlacement(world: World<*, *>, position: Vector2i): Boolean { fun isValidPlacement(world: World<*, *>, position: Vector2i, considerNullAsValid: Boolean = false): Boolean {
val cell = world.chunkMap.getCell(position + this.position) val cell = world.chunkMap.getCell(position + this.position)
if (considerNullAsValid && cell.tile(isBackground).material.isNullTile)
return true
if (!cell.isConnectible(false, isBackground)) if (!cell.isConnectible(false, isBackground))
return false return false

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectOrientation.kt
View File

@ -78,14 +78,14 @@ data class ObjectOrientation(
} }
} }
fun anchorsValid(world: World<*, *>, position: Vector2i): Boolean { fun anchorsValid(world: World<*, *>, position: Vector2i, considerNullAsValid: Boolean = false): Boolean {
if (anchors.isEmpty()) if (anchors.isEmpty())
return true return true
var anyValid = false var anyValid = false
for (anchor in anchors) { for (anchor in anchors) {
val isValid = anchor.isValidPlacement(world, position) val isValid = anchor.isValidPlacement(world, position, considerNullAsValid)
if (isValid) if (isValid)
anyValid = true anyValid = true

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WorldObject.kt
View File

@ -653,7 +653,7 @@ open class WorldObject(val config: Registry.Entry<ObjectDefinition>) : TileEntit
if (!shouldBreak) { if (!shouldBreak) {
val orientation = orientation val orientation = orientation
if (orientation != null && !orientation.anchorsValid(world, tilePosition)) { if (orientation != null && !orientation.anchorsValid(world, tilePosition, considerNullAsValid = true)) {
shouldBreak = true shouldBreak = true
} }
} }