Simplify chunk refreshing and fix a bug in it

where block-specific distance is used instead of chunk distance
gnembon · Dec 28, 2022 · 7efa9df · 7efa9df
1 parent ccd6512
commit 7efa9df
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/main/java/carpet/script/utils/WorldTools.java b/src/main/java/carpet/script/utils/WorldTools.java
@@ -139,17 +139,15 @@ public static boolean createWorld(MinecraftServer server, String worldKey, Long
 
     public static void forceChunkUpdate(BlockPos pos, ServerLevel world)
     {
-        LevelChunk worldChunk = world.getChunkSource().getChunk(pos.getX()>>4, pos.getZ()>>4, false);
+        ChunkPos chunkPos = new ChunkPos(pos);
+        LevelChunk worldChunk = world.getChunkSource().getChunk(chunkPos.x, chunkPos.z, false);
         if (worldChunk != null)
         {
-            int vd = world.getServer().getPlayerList().getViewDistance() * 16;
-            int vvd = vd * vd;
-            List<ServerPlayer> nearbyPlayers = world.getPlayers(p -> pos.distToCenterSqr(p.getX(), pos.getY(), p.getZ()) < vvd);
-            if (!nearbyPlayers.isEmpty())
+            List<ServerPlayer> players = world.getChunkSource().chunkMap.getPlayers(chunkPos, false);
+            if (!players.isEmpty())
             {
                 ClientboundLevelChunkWithLightPacket packet = new ClientboundLevelChunkWithLightPacket(worldChunk, world.getLightEngine(), null, null, false); // false seems to update neighbours as well.
-                ChunkPos chpos = new ChunkPos(pos);
-                nearbyPlayers.forEach(p -> p.connection.send(packet));
+                players.forEach(p -> p.connection.send(packet));
             }
         }
     }