From 98e00f9cfcb63296ccdf774fd6039e012e8e86e0 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Thu, 6 Oct 2022 19:00:50 +0200 Subject: Fix mod toggle preventing singleplayer entry Fixes #219 --- src/main/java/com/aizistral/nochatreports/NoChatReports.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/aizistral/nochatreports') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index 3db427f..3e2e527 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -6,10 +6,12 @@ import org.apache.logging.log4j.Logger; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.network.ServerChannelHandler; +import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; @@ -34,12 +36,14 @@ public final class NoChatReports implements ModInitializer { } private void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server) { + if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) + if (!NCRConfig.getClient().enableMod()) + return; + server.execute(() -> { if (NCRConfig.getCommon().demandOnClient() && !ServerPlayNetworking.canSend(handler, CHANNEL)) { handler.disconnect(Component.literal(NCRConfig.getCommon().demandOnClientMessage())); } - - //handler.disconnect(Component.translatable("multiplayer.disconnect.missing_public_key")); }); } -- cgit v1.2.3