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

Plants without occupied spaces no longer crash server

Browse Source
This commit is contained in:
DBotThePony 2024-04-22 22:16:48 +07:00
parent c2cb8dd208
commit 934e8f8479
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/PlantPieceEntity.kt
View File

@ -148,22 +148,26 @@ class PlantPieceEntity() : DynamicEntity() {
piecesInternal.add(Piece(piece)) piecesInternal.add(Piece(piece))
} }
calculatedMetaBoundingBox = AABB.ofPoints(allSpaces) if (allSpaces.isNotEmpty()) {
calculatedMetaBoundingBox = AABB.ofPoints(allSpaces)
if (pieces.any { it.isStructuralSegment } && stemSpaces.isNotEmpty()) { if (pieces.any { it.isStructuralSegment } && stemSpaces.isNotEmpty()) {
calculatedCollisionBox = AABB.ofPoints(stemSpaces) calculatedCollisionBox = AABB.ofPoints(stemSpaces)
if (stemSpaces.size >= 2) { if (stemSpaces.size >= 2) {
calculatedCollisionHull = Poly.quickhull(stemSpaces.map { it.toDoubleVector() }) calculatedCollisionHull = Poly.quickhull(stemSpaces.map { it.toDoubleVector() })
} else {
calculatedCollisionHull = Poly(calculatedCollisionBox)
}
} else { } else {
calculatedCollisionHull = Poly(calculatedCollisionBox) calculatedCollisionBox = calculatedMetaBoundingBox
calculatedCollisionHull = Poly(calculatedMetaBoundingBox)
} }
} else { } else {
calculatedMetaBoundingBox = AABB.rectangle(Vector2d.ZERO, 0.1, 0.1)
calculatedCollisionBox = calculatedMetaBoundingBox calculatedCollisionBox = calculatedMetaBoundingBox
calculatedCollisionHull = Poly(calculatedMetaBoundingBox) calculatedCollisionHull = Poly(calculatedMetaBoundingBox)
} }
//calculatedCollisionHull = calculatedCollisionHull * 0.5 + calculatedCollisionHull.aabb.centre * 0.5
} }
constructor(stream: DataInputStream, isLegacy: Boolean) : this() { constructor(stream: DataInputStream, isLegacy: Boolean) : this() {