AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 03:15:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

World: don't calculate chunk data if chunk not initialized

Browse Source
This commit is contained in:
Bixilon 2022-12-23 13:15:39 +01:00
parent 5537195b16
commit 3245ce71ae
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/de/bixilon/minosoft/data/world/World.kt
View File

@ -181,12 +181,11 @@ class World(
blockState?.block?.onPlace(connection, blockPosition, blockState)
chunk[inChunkPosition] = blockState
chunk.getOrPutBlockEntity(inChunkPosition)
connection.fire(
BlockSetEvent(
connection = connection,
blockPosition = blockPosition,
blockState = blockState,
)
connection.events.fire(BlockSetEvent(
connection = connection,
blockPosition = blockPosition,
blockState = blockState,
)
)
}
@ -232,10 +231,10 @@ class World(
val offset = ChunkNeighbours.OFFSETS[index]
val neighbourPosition = chunkPosition + offset
neighbour.neighbours.remove(-offset)
connection.fire(ChunkDataChangeEvent(connection, neighbourPosition, neighbour))
connection.events.fire(ChunkDataChangeEvent(connection, neighbourPosition, neighbour))
}
// connection.world.view.updateServerViewDistance(chunkPosition, false)
connection.fire(ChunkUnloadEvent(connection, chunkPosition, chunk))
connection.events.fire(ChunkUnloadEvent(connection, chunkPosition, chunk))
if (chunkPosition.x <= chunkMin.x || chunkPosition.y <= chunkMin.y || chunkPosition.x >= chunkMax.x || chunkPosition.y >= chunkMax.y) {
recalculateChunkExtreme()
}
@ -379,7 +378,7 @@ class World(
chunk.light.recalculate(false)
chunk.light.propagateFromNeighbours()
connection.fire(ChunkDataChangeEvent(connection, chunk.chunkPosition, chunk))
connection.events.fire(ChunkDataChangeEvent(connection, chunk.chunkPosition, chunk))
}
fun onChunkUpdate(chunkPosition: ChunkPosition, chunk: Chunk, checkNeighbours: Boolean = true) {
@ -394,6 +393,7 @@ class World(
}
val offset = ChunkNeighbours.OFFSETS[index]
val neighbour = this[chunkPosition + offset] ?: continue
if (neighbour.sections == null) continue
chunk.neighbours[index] = neighbour
neighbour.neighbours[-offset] = chunk
}
@ -410,7 +410,7 @@ class World(
}
if (chunk.neighbours.complete) {
connection.fire(ChunkDataChangeEvent(connection, chunkPosition, chunk))
connection.events.fire(ChunkDataChangeEvent(connection, chunkPosition, chunk))
}
}