Merge branch 'master' into 1.17

src/main/java/carpet/commands/DrawCommand.java

@@ -224,7 +224,7 @@ public class DrawCommand
                         continue;
                     }
 
-                    CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates;
+                    CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates);
                     for (int xmod = -1; xmod < 2; xmod += 2)
                     {
                         for (int ymod = -1; ymod < 2; ymod += 2)
@@ -238,7 +238,7 @@ public class DrawCommand
                             }
                         }
                     }
-                    CarpetSettings.impendingFillSkipUpdates = false;
+                    CarpetSettings.impendingFillSkipUpdates.set(false);
                 }
             }
         }
@@ -274,7 +274,7 @@ public class DrawCommand
 
         ServerWorld world = source.getWorld();
 
-        CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates;
+        CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates);
 
         for (int r = 0; r < radius; ++r)
         {
@@ -290,7 +290,7 @@ public class DrawCommand
             }
         }
 
-        CarpetSettings.impendingFillSkipUpdates = false;
+        CarpetSettings.impendingFillSkipUpdates.set(false);
 
         if (CarpetSettings.fillUpdates)
         {
@@ -377,7 +377,7 @@ public class DrawCommand
 
         ServerWorld world = source.getWorld();
 
-        CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates;
+        CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates);
 
         boolean isSquare = base.equalsIgnoreCase("square");
 
@@ -387,7 +387,7 @@ public class DrawCommand
             affected+= fillFlat(world, pos, i, r, isSquare, orientation, block, replacement, list, mbpos);
         }
         
-        CarpetSettings.impendingFillSkipUpdates = false;
+        CarpetSettings.impendingFillSkipUpdates.set(false);
 
         if (CarpetSettings.fillUpdates) {
 
@@ -429,7 +429,7 @@ public class DrawCommand
 
         ServerWorld world = source.getWorld();
 
-        CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates;
+        CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates);
 
         boolean isSquare = base.equalsIgnoreCase("square");
 
@@ -438,7 +438,7 @@ public class DrawCommand
             affected+= fillFlat(world, pos, i, radius, isSquare, orientation, block, replacement, list, mbpos);
         }
 
-        CarpetSettings.impendingFillSkipUpdates = false;
+        CarpetSettings.impendingFillSkipUpdates.set(false);
 
         if (CarpetSettings.fillUpdates) {
 

src/main/java/carpet/commands/PlayerCommand.java

@@ -192,9 +192,14 @@ public class PlayerCommand
         GameProfile profile = server.getUserCache().findByName(playerName);
         if (profile == null)
         {
-            Messenger.m(context.getSource(), "r Player "+playerName+" is either banned by Mojang, or auth servers are down. " +
-                    "Banned players can only be summoned in Singleplayer and in servers in off-line mode.");
-            return true;
+            if (!CarpetSettings.allowSpawningOfflinePlayers)
+            {
+                Messenger.m(context.getSource(), "r Player "+playerName+" is either banned by Mojang, or auth servers are down. " +
+                        "Banned players can only be summoned in Singleplayer and in servers in off-line mode.");
+                return true;
+            } else {
+                profile = new GameProfile(PlayerEntity.getOfflinePlayerUuid(playerName), playerName);
+            }
         }
         if (manager.getUserBanList().contains(profile))
         {

src/main/java/carpet/commands/ScriptCommand.java

@@ -508,7 +508,7 @@ public class ScriptCommand
             return 1;
         }
         int successCount = 0;
-        CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates;
+        CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates);
         try
         {
             for (int x = area.getMinX(); x <= area.getMaxX(); x++)
@@ -535,7 +535,7 @@ public class ScriptCommand
         }
         finally
         {
-            CarpetSettings.impendingFillSkipUpdates = false;
+            CarpetSettings.impendingFillSkipUpdates.set(false);
         }
         Messenger.m(source, "w Expression successful in " + successCount + " out of " + int_1 + " blocks");
         return successCount;
@@ -618,7 +618,7 @@ public class ScriptCommand
         }
         int affected = 0;
 
-        CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates;
+        CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates);
         for (int x = 0; x <= maxx; x++)
         {
             for (int y = 0; y <= maxy; y++)
@@ -643,7 +643,7 @@ public class ScriptCommand
                 }
             }
         }
-        CarpetSettings.impendingFillSkipUpdates = false;
+        CarpetSettings.impendingFillSkipUpdates.set(false);
 
         if (CarpetSettings.fillUpdates && block != null)
         {