From 20280096851ec185ff365c73070f554e3fc71640 Mon Sep 17 00:00:00 2001 From: themode Date: Sun, 21 Mar 2021 12:02:23 +0100 Subject: [PATCH] Temporarily disable traffic handler, improve chunk viewers set --- src/main/java/net/minestom/server/instance/Chunk.java | 4 ++-- .../java/net/minestom/server/network/netty/NettyServer.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minestom/server/instance/Chunk.java b/src/main/java/net/minestom/server/instance/Chunk.java index 81e5e2e0f..39fa03580 100644 --- a/src/main/java/net/minestom/server/instance/Chunk.java +++ b/src/main/java/net/minestom/server/instance/Chunk.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.*; -import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ConcurrentHashMap; // TODO light data & API @@ -72,7 +72,7 @@ public abstract class Chunk implements Viewable, DataContainer { private boolean readOnly; protected volatile boolean loaded = true; - protected final Set viewers = new CopyOnWriteArraySet<>(); + protected final Set viewers = ConcurrentHashMap.newKeySet(); private final Set unmodifiableViewers = Collections.unmodifiableSet(viewers); // Path finding diff --git a/src/main/java/net/minestom/server/network/netty/NettyServer.java b/src/main/java/net/minestom/server/network/netty/NettyServer.java index 9c5ff8733..44541205a 100644 --- a/src/main/java/net/minestom/server/network/netty/NettyServer.java +++ b/src/main/java/net/minestom/server/network/netty/NettyServer.java @@ -167,7 +167,8 @@ public final class NettyServer { ChannelPipeline pipeline = ch.pipeline(); - pipeline.addLast(TRAFFIC_LIMITER_HANDLER_NAME, globalTrafficHandler); + // TODO enable when properly implemented (dynamic limit based on the number of clients) + //pipeline.addLast(TRAFFIC_LIMITER_HANDLER_NAME, globalTrafficHandler); // First check should verify if the packet is a legacy ping (from 1.6 version and earlier) // Removed from the pipeline later in LegacyPingHandler if unnecessary (>1.6)