From 36908d6578e4c69f119a497eb78f4f7178c3e7b2 Mon Sep 17 00:00:00 2001 From: altrisi Date: Wed, 26 Jul 2023 16:39:31 +0200 Subject: [PATCH] Fix sending Carpet tickrate to players without Carpet installed Fixes #1772 --- src/main/java/carpet/network/ServerNetworkHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java index c216f003..0c525f03 100644 --- a/src/main/java/carpet/network/ServerNetworkHandler.java +++ b/src/main/java/carpet/network/ServerNetworkHandler.java @@ -79,7 +79,7 @@ public class ServerNetworkHandler else CarpetSettings.LOG.warn("Player "+playerEntity.getName().getString()+" joined with another carpet version: "+clientVersion); - DataBuilder data = DataBuilder.create(playerEntity.server);//;.withTickRate().withFrozenState().withTickPlayerActiveTimeout(); // .withSuperHotState() + DataBuilder data = DataBuilder.create(playerEntity.server); // tickrate related settings are sent on world change CarpetServer.settingsManager.getCarpetRules().forEach(data::withRule); CarpetServer.extensions.forEach(e -> { SettingsManager eManager = e.extensionSettingsManager(); @@ -91,6 +91,7 @@ public class ServerNetworkHandler } public static void sendPlayerLevelData(ServerPlayer player, ServerLevel level) { + if (CarpetSettings.superSecretSetting || !validCarpetPlayers.contains(player)) return; DataBuilder data = DataBuilder.create(player.server).withTickRate().withFrozenState().withTickPlayerActiveTimeout(); // .withSuperHotState() player.connection.send(new ClientboundCustomPayloadPacket(CarpetClient.CARPET_CHANNEL, data.build() ));