AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 18:05:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some water physics bugs

Browse Source
This commit is contained in:
Bixilon 2023-05-31 20:37:55 +02:00
parent 5f4aaf0966
commit dd28d3c16b
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/physics/submersion/SubmersionState.kt
View File

@ -15,6 +15,7 @@ package de.bixilon.minosoft.physics.submersion
import de.bixilon.kotlinglm.vec3.Vec3d import de.bixilon.kotlinglm.vec3.Vec3d
import de.bixilon.kotlinglm.vec3.Vec3i import de.bixilon.kotlinglm.vec3.Vec3i
import de.bixilon.kutil.math.simple.DoubleMath.floor
import de.bixilon.minosoft.data.Tickable import de.bixilon.minosoft.data.Tickable
import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity
@ -22,6 +23,7 @@ import de.bixilon.minosoft.data.entities.entities.vehicle.boat.Boat
import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.registries.blocks.state.BlockState
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidHolder import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidHolder
import de.bixilon.minosoft.data.registries.fluid.Fluid import de.bixilon.minosoft.data.registries.fluid.Fluid
import de.bixilon.minosoft.data.registries.fluid.fluids.LavaFluid
import de.bixilon.minosoft.data.registries.fluid.fluids.WaterFluid import de.bixilon.minosoft.data.registries.fluid.fluids.WaterFluid
import de.bixilon.minosoft.data.registries.fluid.handler.FluidCollisionHandler import de.bixilon.minosoft.data.registries.fluid.handler.FluidCollisionHandler
import de.bixilon.minosoft.data.registries.fluid.handler.FluidEnterHandler import de.bixilon.minosoft.data.registries.fluid.handler.FluidEnterHandler
@ -147,11 +149,12 @@ class SubmersionState(private val physics: EntityPhysics<*>) : Tickable {
// TODO // TODO
} }
val position = physics.position val position = physics.position
val block = physics.positionInfo.chunk?.get(position.x.toInt() and 0x0F, position.y.toInt(), position.z.toInt() and 0x0F) ?: return val eyePosition = Vec3i(position.x.floor, eyeHeight.floor, position.z.floor)
val block = physics.positionInfo.chunk?.get(eyePosition.x and 0x0F, eyePosition.y, eyePosition.z and 0x0F) ?: return
if (block.block !is FluidHolder) { if (block.block !is FluidHolder) {
return return
} }
val eyePosition = Vec3i(physics.position.x.toInt(), eyeHeight.toInt(), physics.position.z.toInt())
val fluidHeight = eyePosition.y + getFluidHeight(eyePosition, block, block.block.fluid) val fluidHeight = eyePosition.y + getFluidHeight(eyePosition, block, block.block.fluid)
if (fluidHeight > eyeHeight) { if (fluidHeight > eyeHeight) {
@ -175,7 +178,7 @@ class SubmersionState(private val physics: EntityPhysics<*>) : Tickable {
private fun update() { private fun update() {
val previousWater = this.heights.getDouble(WaterFluid) val previousWater = this.heights.getDouble(WaterFluid)
val previousLava = this.heights.getDouble(WaterFluid) val previousLava = this.heights.getDouble(LavaFluid)
clear() clear()