From cc08cc85d91ec206f11ce9a5208c2eda42519632 Mon Sep 17 00:00:00 2001 From: austin Date: Sat, 30 Nov 2024 20:50:01 -0500 Subject: [PATCH] fix fluid sim bounds loop --- .../java/electrosphere/client/fluid/cells/FluidCell.java | 7 ++++--- .../electrosphere/client/fluid/cells/FluidCellManager.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/electrosphere/client/fluid/cells/FluidCell.java b/src/main/java/electrosphere/client/fluid/cells/FluidCell.java index 4aeb14cf..562b3ec5 100644 --- a/src/main/java/electrosphere/client/fluid/cells/FluidCell.java +++ b/src/main/java/electrosphere/client/fluid/cells/FluidCell.java @@ -14,6 +14,7 @@ import electrosphere.entity.EntityDataStrings; import electrosphere.entity.types.fluid.FluidChunk; import electrosphere.renderer.shader.VisualShader; import electrosphere.server.fluid.manager.ServerFluidChunk; +import electrosphere.server.terrain.manager.ServerTerrainChunk; /** * @@ -73,9 +74,9 @@ public class FluidCell { protected Vector3d getRealPos(){ return new Vector3d( - worldPos.x * FluidChunkData.CHUNK_SIZE, - worldPos.y * FluidChunkData.CHUNK_SIZE, - worldPos.z * FluidChunkData.CHUNK_SIZE + worldPos.x * ServerTerrainChunk.CHUNK_PLACEMENT_OFFSET, + worldPos.y * ServerTerrainChunk.CHUNK_PLACEMENT_OFFSET, + worldPos.z * ServerTerrainChunk.CHUNK_PLACEMENT_OFFSET ); } diff --git a/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java b/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java index 597dc054..dcebc781 100644 --- a/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java +++ b/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java @@ -334,9 +334,9 @@ public class FluidCellManager { worldPos.z < Globals.clientWorldData.getWorldDiscreteSize() ){ String key = getCellKey( - Globals.clientWorldData.convertRealToChunkSpace(chunkRealSpace.x), - Globals.clientWorldData.convertRealToChunkSpace(chunkRealSpace.y), - Globals.clientWorldData.convertRealToChunkSpace(chunkRealSpace.z) + worldPos.x, + worldPos.y, + worldPos.z ); if(!keyCellMap.containsKey(key) && !hasNotRequested.contains(key) && !undrawable.contains(key) && !drawable.contains(key) && !hasRequested.contains(key)){