Skip to content

Fix Folia collection races #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nobuildersnotools wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Folia collection races #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions src/main/java/tf/tuff/viablocks/CustomBlockListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import javax.annotation.Nonnull;

Expand Down Expand Up @@ -53,11 +54,19 @@ public class CustomBlockListener {
private static final long Y_MASK = (1L << 12) - 1L;
private static final int Z_SHIFT = 12;
private static final int X_SHIFT = 12 + 26;
private final Map<UUID, Map<Integer, List<Long>>> pendingUpdates = new HashMap<>();
private final Set<UUID> pendingFlush = new HashSet<>();
private final Map<UUID, PendingBatch> pendingUpdates = new ConcurrentHashMap<>();
private static final double UPDATE_RADIUS_SQUARED = 6400;
private static final @Nonnull byte[] EMPTY_PACKET = new byte[0];

private static final class PendingBatch {
final Map<Integer, List<Long>> updates = new HashMap<>();
final AtomicBoolean flushScheduled = new AtomicBoolean();

void add(int stateId, long location) {
updates.computeIfAbsent(stateId, ignored -> new ArrayList<>()).add(location);
}
}

private final Cache<BlockData, Integer> blockDataIdCache;
private final Cache<String, byte[]> chunkPacketCache;

Expand Down Expand Up @@ -185,7 +194,6 @@ public void handlePlayerQuit(PlayerQuitEvent event) {

UUID playerId = event.getPlayer().getUniqueId();
pendingUpdates.remove(playerId);
pendingFlush.remove(playerId);
plugin.viaBlocksEnabledPlayers.remove(playerId);
plugin.setPlayerEnabled(event.getPlayer(), false);
}
Expand Down Expand Up @@ -549,31 +557,24 @@ private void invalidateChunkCache(Chunk chunk) {
private void sendPacket(Player player, int stateId, Location location) {
if (!player.isOnline()) return;
UUID playerId = player.getUniqueId();
Map<Integer, List<Long>> updateData = pendingUpdates.get(playerId);
if (updateData == null) {
updateData = new HashMap<>();
pendingUpdates.put(playerId, updateData);
}
List<Long> stateList = updateData.get(stateId);
if (stateList == null) {
stateList = new ArrayList<>();
updateData.put(stateId, stateList);
}
stateList.add(packLocation(location));
if (pendingFlush.add(playerId)) {
SchedulerCompat.runEntityLater(player, plugin.plugin, () -> flushPendingUpdates(playerId), plugin.getUpdateBatchDelayTicks());
PendingBatch batch = pendingUpdates.compute(playerId, (ignored, pending) -> {
PendingBatch current = pending != null ? pending : new PendingBatch();
current.add(stateId, packLocation(location));
return current;
});
if (batch.flushScheduled.compareAndSet(false, true)) {
SchedulerCompat.runEntityLater(player, plugin.plugin,
() -> flushPendingUpdates(playerId, batch), plugin.getUpdateBatchDelayTicks());
}
}

private void flushPendingUpdates(UUID playerId) {
Map<Integer, List<Long>> updateData = pendingUpdates.remove(playerId);
pendingFlush.remove(playerId);
if (updateData == null || updateData.isEmpty()) return;
private void flushPendingUpdates(UUID playerId, PendingBatch batch) {
if (!pendingUpdates.remove(playerId, batch) || batch.updates.isEmpty()) return;

Player player = plugin.plugin.getServer().getPlayer(playerId);
if (player == null || !player.isOnline()) return;

byte[] packetData = buildChunkPacket(updateData);
byte[] packetData = buildChunkPacket(batch.updates);
SchedulerCompat.sendPluginMessage(plugin.plugin, player, ViaBlocksPlugin.CLIENTBOUND_CHANNEL, packetData);
}

Expand Down Expand Up @@ -630,7 +631,6 @@ public void processChunkForSinglePlayer(Chunk chunk, Player player) {
public void clearCache() {
blockDataIdCache.invalidateAll();
pendingUpdates.clear();
pendingFlush.clear();
chunkPacketCache.invalidateAll();
recentModernChanges.invalidateAll();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tf/tuff/viaentities/ViaEntitiesPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import tf.tuff.TuffX;
import org.bukkit.entity.Player;

import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;

import tf.tuff.util.SchedulerCompat;
Expand All @@ -15,7 +15,7 @@ public final class ViaEntitiesPlugin {
public static final String CLIENTBOUND_CHANNEL = "viaentities:data";
public static final String SERVERBOUND_CHANNEL = "entities:handshake";

public final Set<UUID> viaEntitiesEnabledPlayers = new HashSet<>();
public final Set<UUID> viaEntitiesEnabledPlayers = ConcurrentHashMap.newKeySet();

static ViaEntitiesPlugin instance;

Expand Down
Loading