Merge branch 'master' into 1.15

src/main/java/carpet/settings/CarpetSettings.java

@@ -147,8 +147,8 @@ public class CarpetSettings
     @Rule( desc = "Guardians turn into Elder Guardian when struck by lightning", category = FEATURE )
     public static boolean renewableSponges = false;
 
-    @Rule( desc = "Pistons can push tile entities, like hoppers, chests etc.", category = {EXPERIMENTAL, FEATURE} )
-    public static boolean movableTileEntities = false;
+    @Rule( desc = "Pistons can push block entities, like hoppers, chests etc.", category = {EXPERIMENTAL, FEATURE} )
+    public static boolean movableBlockEntities = false;
 
     @Rule( desc = "Saplings turn into dead shrubs in hot climates and no water access", category = FEATURE )
     public static boolean desertShrubs = false;

src/main/java/carpet/settings/SettingsManager.java

@@ -11,6 +11,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.ServerTask;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.BaseText;
@@ -168,10 +169,13 @@ public class SettingsManager
         {
             return;
         }
-        for (ServerPlayerEntity entityplayermp : server.getPlayerManager().getPlayerList())
+        server.method_18858(new ServerTask(this.server.getTicks(), () ->
         {
-            server.getCommandManager().sendCommandTree(entityplayermp);
-        }
+            for (ServerPlayerEntity entityplayermp : server.getPlayerManager().getPlayerList())
+            {
+                server.getCommandManager().sendCommandTree(entityplayermp);
+            }
+        }));
     }
 
     private void loadConfigurationFromConf()
@@ -434,6 +438,11 @@ public class SettingsManager
             args.add(makeSetRuleButton(rule, option, true));
             args.add("w  ");
         }
+        if (!rule.options.contains(rule.getAsString()))
+        {
+            args.add(makeSetRuleButton(rule, rule.getAsString(), true));
+            args.add("w  ");
+        }
         args.remove(args.size()-1);
         return Messenger.c(args.toArray(new Object[0]));
     }