Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java

src/main/java/carpet/network/ServerNetworkHandler.java

@@ -19,8 +19,8 @@ import java.util.Set;
 
 public class ServerNetworkHandler
 {
-    public static Map<ServerPlayerEntity, String> remoteCarpetPlayers = new HashMap<>();
-    public static Set<ServerPlayerEntity> validCarpetPlayers = new HashSet<>();
+    private static Map<ServerPlayerEntity, String> remoteCarpetPlayers = new HashMap<>();
+    private static Set<ServerPlayerEntity> validCarpetPlayers = new HashSet<>();
 
     public static void handleData(PacketByteBuf data, ServerPlayerEntity player)
     {
@@ -64,6 +64,7 @@ public class ServerNetworkHandler
     
     public static void updateRuleWithConnectedClients(ParsedRule<?> rule)
     {
+        if (CarpetSettings.superSecretSetting) return;
         for (ServerPlayerEntity player : remoteCarpetPlayers.keySet())
         {
             player.networkHandler.sendPacket(new CustomPayloadS2CPacket(
@@ -75,6 +76,7 @@ public class ServerNetworkHandler
     
     public static void updateTickSpeedToConnectedPlayers()
     {
+        if (CarpetSettings.superSecretSetting) return;
         for (ServerPlayerEntity player : remoteCarpetPlayers.keySet())
         {
             player.networkHandler.sendPacket(new CustomPayloadS2CPacket(
@@ -86,6 +88,7 @@ public class ServerNetworkHandler
 
     public static void broadcastCustomCommand(String command, Tag data)
     {
+        if (CarpetSettings.superSecretSetting) return;
         for (ServerPlayerEntity player : validCarpetPlayers)
         {
             player.networkHandler.sendPacket(new CustomPayloadS2CPacket(
@@ -97,7 +100,7 @@ public class ServerNetworkHandler
 
     public static void sendCustomCommand(ServerPlayerEntity player, String command, Tag data)
     {
-        if (validCarpetPlayers.contains(player))
+        if (isValidCarpetPlayer(player))
         {
             player.networkHandler.sendPacket(new CustomPayloadS2CPacket(
                     CarpetClient.CARPET_CHANNEL,
@@ -120,6 +123,13 @@ public class ServerNetworkHandler
         validCarpetPlayers.clear();
     }
 
+    public static boolean isValidCarpetPlayer(ServerPlayerEntity player)
+    {
+        if (CarpetSettings.superSecretSetting) return false;
+        return validCarpetPlayers.contains(player);
+
+    }
+
     private static class DataBuilder
     {
         private CompoundTag tag;