Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#959: Fix World#refreshChunk

Browse Source
This commit is contained in:
Gero 2021-11-28 11:54:00 +11:00 committed by md_5
parent af8a8b708c
commit c86a3f7a58
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -22,11 +22,13 @@ import java.util.UUID;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import net.minecraft.core.BlockPosition; import net.minecraft.core.BlockPosition;
import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
import net.minecraft.network.protocol.game.PacketPlayOutCustomSoundEffect; import net.minecraft.network.protocol.game.PacketPlayOutCustomSoundEffect;
import net.minecraft.network.protocol.game.PacketPlayOutUpdateTime; import net.minecraft.network.protocol.game.PacketPlayOutUpdateTime;
import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent; import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
import net.minecraft.resources.MinecraftKey; import net.minecraft.resources.MinecraftKey;
import net.minecraft.server.level.ChunkMapDistance; import net.minecraft.server.level.ChunkMapDistance;
import net.minecraft.server.level.EntityPlayer;
import net.minecraft.server.level.PlayerChunk; import net.minecraft.server.level.PlayerChunk;
import net.minecraft.server.level.Ticket; import net.minecraft.server.level.Ticket;
import net.minecraft.server.level.TicketType; import net.minecraft.server.level.TicketType;
@ -292,21 +294,22 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override @Override
public boolean refreshChunk(int x, int z) { public boolean refreshChunk(int x, int z) {
if (!isChunkLoaded(x, z)) { PlayerChunk playerChunk = world.getChunkSource().chunkMap.visibleChunkMap.get(ChunkCoordIntPair.asLong(x, z));
return false; if (playerChunk == null) return false;
}
int px = x << 4; playerChunk.getTickingChunkFuture().thenAccept(either -> {
int pz = z << 4; either.left().ifPresent(chunk -> {
List<EntityPlayer> playersInRange = playerChunk.playerProvider.getPlayers(playerChunk.getPos(), false);
if (playersInRange.isEmpty()) return;
// If there are more than 64 updates to a chunk at once, it will update all 'touched' sections within the chunk ClientboundLevelChunkWithLightPacket refreshPacket = new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), null, null, true);
// And will include biome data if all sections have been 'touched' for (EntityPlayer player : playersInRange) {
// This flags 65 blocks distributed across all the sections of the chunk, so that everything is sent, including biomes if (player.connection == null) continue;
int height = getMaxHeight() / 16;
for (int idx = 0; idx < 64; idx++) { player.connection.send(refreshPacket);
world.sendBlockUpdated(new BlockPosition(px + (idx / height), ((idx % height) * 16), pz), Blocks.AIR.defaultBlockState(), Blocks.STONE.defaultBlockState(), 3); }
} });
world.sendBlockUpdated(new BlockPosition(px + 15, (height * 16) - 1, pz + 15), Blocks.AIR.defaultBlockState(), Blocks.STONE.defaultBlockState(), 3); });
return true; return true;
} }