From a2949b81248303c4949758a4a1003d0bda7c5381 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:52:10 +0500 Subject: [PATCH] Change some string & remove unused config item --- .../distanthorizons/core/config/Config.java | 16 +++------------- .../multiplayer/server/ServerPlayerState.java | 4 ++-- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java index 710bcc2c6..afe065589 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java @@ -169,8 +169,9 @@ public class Config "\n" + "Note for servers:\n" + "This setting does not prevent players from generating farther out.\n" + - "If you want to limit performance impact, change rate/concurrency (RC) limits\n" + - "and thread count/runtime ratio settings instead.") + "If you want to limit performance impact, change rate limits\n" + + "and thread count/runtime ratio settings instead.\n" + + "It also does not affect the visuals on clients.") .setPerformance(EConfigEntryPerformance.HIGH) .build(); @@ -979,17 +980,6 @@ public class Config .build(); - public static ConfigEntry rateLimitHitTolerance = new ConfigEntry.Builder() - .setServersideShortName("rateLimitHitTolerance") - .setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) - .setMinDefaultMax(1, 10, 100) - .comment("" - + "The amount of rate/concurrency limit hits a client can make in one second before being disconnected by the server.\n" - + "This setting only applies to the server and has no effect on clients." - + "") - .build(); - - public static ConfigEntry sendLevelKeys = new ConfigEntry.Builder() .setServersideShortName("sendLevelKeys") diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java index 106498ac7..0d805e676 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java @@ -91,14 +91,14 @@ public class ServerPlayerState public final SupplierBasedRateAndConcurrencyLimiter generationRequestRateLimiter = new SupplierBasedRateAndConcurrencyLimiter<>( () -> ServerNetworking.generationRequestRateLimit.get(), msg -> { - msg.sendResponse(new RateLimitedException("Full data request rate/concurrency limit: " + ServerPlayerState.this.config.getGenerationRequestRateLimit())); + msg.sendResponse(new RateLimitedException("Full data request rate limit: " + ServerPlayerState.this.config.getGenerationRequestRateLimit())); } ); public final SupplierBasedRateAndConcurrencyLimiter syncOnLoginRateLimiter = new SupplierBasedRateAndConcurrencyLimiter<>( () -> ServerNetworking.syncOnLoginRateLimit.get(), msg -> { - msg.sendResponse(new RateLimitedException("Data sync rate/concurrency limit: " + ServerPlayerState.this.config.getSyncOnLoginRateLimit())); + msg.sendResponse(new RateLimitedException("Sync on login rate limit: " + ServerPlayerState.this.config.getSyncOnLoginRateLimit())); } );