more thread safe carpet globs

This commit is contained in:
gnembon committed 2021-05-25 17:24:14 -03:00
1 parent 5d00709b1f
commit f18cc1c836
19 files changed
+48 -52

No files matched your search

@@ -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) {
@@ -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.minX; x <= area.maxX; 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)
{