From e2e00f7ef14633c56d88a2ba8955a6366ad21428 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 May 2016 12:11:02 -0500 Subject: [PATCH] Use chunk util method that exists instead of own thing --- .../botania/api/internal/VanillaPacketDispatcher.java | 8 ++++---- .../java/vazkii/botania/common/network/PacketHandler.java | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 37cf9083b..a9aa22a9b 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -24,17 +24,17 @@ public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { if(tile.getWorld() instanceof WorldServer) { WorldServer ws = ((WorldServer) tile.getWorld()); - PlayerChunkMapEntry chunk = ws.getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4); + SPacketUpdateTileEntity packet = tile.getUpdatePacket(); - if(chunk == null) + if(packet == null) return; for (EntityPlayer player : ws.playerEntities) { EntityPlayerMP playerMP = ((EntityPlayerMP) player); if (playerMP.getDistanceSq(tile.getPos()) < 64 * 64 - && chunk.containsPlayer(playerMP)) { - playerMP.connection.sendPacket(tile.getUpdatePacket()); + && ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4)) { + playerMP.connection.sendPacket(packet); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index a44d8a86b..89075fdb8 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -26,16 +26,12 @@ public final class PacketHandler { public static void sendToNearby(World world, BlockPos pos, IMessage toSend) { if(world instanceof WorldServer) { WorldServer ws = ((WorldServer) world); - PlayerChunkMapEntry chunk = ws.getPlayerChunkMap().getEntry(pos.getX() >> 4, pos.getZ() >> 4); - - if(chunk == null) - return; for (EntityPlayer player : ws.playerEntities) { EntityPlayerMP playerMP = ((EntityPlayerMP) player); if (playerMP.getDistanceSq(pos) < 64 * 64 - && chunk.containsPlayer(playerMP)) { + && ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, pos.getX() >> 4, pos.getZ() >> 4)) { HANDLER.sendTo(toSend, playerMP); } }