From 551a5f1a72e24dcfd84e4f70285b6bd61bf71094 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Sun, 5 May 2024 16:55:15 +0500 Subject: [PATCH] Fix updates --- .../core/file/fullDatafile/FullDataSourceProviderV2.java | 2 +- .../seibel/distanthorizons/core/level/DhServerLevel.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataSourceProviderV2.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataSourceProviderV2.java index a0387f494..6a3f99422 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataSourceProviderV2.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataSourceProviderV2.java @@ -188,7 +188,7 @@ public class FullDataSourceProviderV2 ); preparedStatement.setInt(1, pos.getDetailLevel() - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL); preparedStatement.setInt(2, pos.getX()); - preparedStatement.setInt(3, pos.getX()); + preparedStatement.setInt(3, pos.getZ()); List> row = this.repo.query(preparedStatement); return !row.isEmpty() ? (Long) row.get(0).get("LastModifiedUnixDateTime") : null; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java index 414d634b2..10f8f59a7 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java @@ -235,7 +235,7 @@ public class DhServerLevel extends AbstractDhLevel implements IDhServerLevel { if (!Config.Client.Advanced.Multiplayer.ServerNetworking.enableRealTimeUpdates.get()) { - this.getFullDataProvider().updateDataSourceAsync(data); + return this.getFullDataProvider().updateDataSourceAsync(data); } for (ServerPlayerState serverPlayerState : this.remotePlayerConnectionHandler.getConnectedPlayers()) @@ -246,9 +246,9 @@ public class DhServerLevel extends AbstractDhLevel implements IDhServerLevel } Vec3d playerPosition = serverPlayerState.serverPlayer.getPosition(); - double distanceFromPlayer = data.getPos().getManhattanBlockDistance(new DhBlockPos2D((int) playerPosition.x, (int) playerPosition.z)); - if (distanceFromPlayer > serverPlayerState.serverPlayer.getViewDistance() && - distanceFromPlayer < serverPlayerState.config.getRenderDistanceRadius()) + int distanceFromPlayer = data.getPos().getManhattanBlockDistance(new DhBlockPos2D((int) playerPosition.x, (int) playerPosition.z)) / 16; + if (distanceFromPlayer >= serverPlayerState.serverPlayer.getViewDistance() && + distanceFromPlayer <= serverPlayerState.config.getRenderDistanceRadius()) { serverPlayerState.connection.sendMessage(new FullDataPartialUpdateMessage(this.serverLevelWrapper, data)); }