Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-15 03:41:30 +01:00
Code Issues Projects Releases Wiki Activity

feat: add properties to configure chunk queue

Browse Source
This commit is contained in:
mworzala 2024-01-06 03:33:36 -05:00 committed by Matt Worzala
parent 40ac94d092
commit a910ce359d
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/entity/Player.java
View File

@ -79,6 +79,7 @@ import net.minestom.server.statistic.PlayerStatistic;
import net.minestom.server.timer.Scheduler; import net.minestom.server.timer.Scheduler;
import net.minestom.server.utils.MathUtils; import net.minestom.server.utils.MathUtils;
import net.minestom.server.utils.PacketUtils; import net.minestom.server.utils.PacketUtils;
import net.minestom.server.utils.PropertyUtils;
import net.minestom.server.utils.async.AsyncUtils; import net.minestom.server.utils.async.AsyncUtils;
import net.minestom.server.utils.chunk.ChunkUpdateLimitChecker; import net.minestom.server.utils.chunk.ChunkUpdateLimitChecker;
import net.minestom.server.utils.chunk.ChunkUtils; import net.minestom.server.utils.chunk.ChunkUtils;
@ -121,8 +122,9 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
private static final int PACKET_PER_TICK = Integer.getInteger("minestom.packet-per-tick", 20); private static final int PACKET_PER_TICK = Integer.getInteger("minestom.packet-per-tick", 20);
private static final int PACKET_QUEUE_SIZE = Integer.getInteger("minestom.packet-queue-size", 1000); private static final int PACKET_QUEUE_SIZE = Integer.getInteger("minestom.packet-queue-size", 1000);
private static final float MIN_CHUNKS_PER_TICK = 0.01f; private static final float MIN_CHUNKS_PER_TICK = PropertyUtils.getFloat("minestom.chunk-queue.min-per-tick", 0.01f);
private static final float MAX_CHUNKS_PER_TICK = 64.0f; private static final float MAX_CHUNKS_PER_TICK = PropertyUtils.getFloat("minestom.chunk-queue.max-per-tick", 64.0f);
private static final float CHUNKS_PER_TICK_MULTIPLIER = PropertyUtils.getFloat("minestom.chunk-queue.multiplier", 1f);
public static final boolean EXPERIMENT_PERFORM_POSE_UPDATES = Boolean.getBoolean("minestom.experiment.pose-updates"); public static final boolean EXPERIMENT_PERFORM_POSE_UPDATES = Boolean.getBoolean("minestom.experiment.pose-updates");
@ -767,8 +769,8 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
public void onChunkBatchReceived(float newTargetChunksPerTick) { public void onChunkBatchReceived(float newTargetChunksPerTick) {
// logger.debug("chunk batch received player={} chunks/tick={} lead={}", username, newTargetChunksPerTick, chunkBatchLead); // logger.debug("chunk batch received player={} chunks/tick={} lead={}", username, newTargetChunksPerTick, chunkBatchLead);
chunkBatchLead -= 1; chunkBatchLead -= 1;
targetChunksPerTick = Float.isNaN(newTargetChunksPerTick) ? MIN_CHUNKS_PER_TICK targetChunksPerTick = Float.isNaN(newTargetChunksPerTick) ? MIN_CHUNKS_PER_TICK : MathUtils.clamp(
: MathUtils.clamp(newTargetChunksPerTick, MIN_CHUNKS_PER_TICK, MAX_CHUNKS_PER_TICK); newTargetChunksPerTick * CHUNKS_PER_TICK_MULTIPLIER, MIN_CHUNKS_PER_TICK, MAX_CHUNKS_PER_TICK);
// Beyond the first batch we can preemptively send up to 10 (matching mojang server) // Beyond the first batch we can preemptively send up to 10 (matching mojang server)
if (maxChunkBatchLead == 1) maxChunkBatchLead = 10; if (maxChunkBatchLead == 1) maxChunkBatchLead = 10;

10
src/main/java/net/minestom/server/utils/PropertyUtils.java
View File

@ -23,4 +23,14 @@ public final class PropertyUtils {
public static String getString(@NotNull String name, @Nullable String defaultValue) { public static String getString(@NotNull String name, @Nullable String defaultValue) {
return System.getProperty(name, defaultValue); return System.getProperty(name, defaultValue);
} }
public static Float getFloat(String name, Float defaultValue) {
Float result = defaultValue;
try {
final String value = System.getProperty(name);
if (value != null) result = Float.parseFloat(value);
} catch (IllegalArgumentException | NullPointerException ignored) {
}
return result;
}
} }