diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 848d0d4d..d2733614 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -52,6 +52,7 @@ public class CarpetSettings public static boolean doChainStone = false; public static boolean chainStoneStickToAll = false; public static Block structureBlockIgnoredBlock = Blocks.STRUCTURE_VOID; + public static final int vanillaStructureBlockLimit = 48; private static class LanguageValidator extends Validator { @Override public String validate(ServerCommandSource source, ParsedRule currentRule, String newValue, String string) { @@ -802,7 +803,7 @@ public class CarpetSettings public static class StructureBlockLimitValidator extends Validator { @Override public Integer validate(ServerCommandSource source, ParsedRule currentRule, Integer newValue, String string) { - return (newValue >= 48) ? newValue : null; + return (newValue >= vanillaStructureBlockLimit) ? newValue : null; } @Override @@ -823,7 +824,7 @@ public class CarpetSettings validate = StructureBlockLimitValidator.class, strict = false ) - public static int structureBlockLimit = 48; + public static int structureBlockLimit = vanillaStructureBlockLimit; public static class StructureBlockIgnoredValidator extends Validator { diff --git a/src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java b/src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java index b7177773..78509307 100644 --- a/src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java +++ b/src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java @@ -38,7 +38,7 @@ public class UpdateStructureBlockC2SPacketMixin { ) private void structureBlockLimitsWrite(PacketByteBuf buf, CallbackInfo ci) { //client method, only applicable if with carpet is on the server, or running locally - if (CarpetSettings.structureBlockLimit >= 128) + if (CarpetSettings.structureBlockLimit != CarpetSettings.vanillaStructureBlockLimit) { buf.writeInt(this.offset.getX()); buf.writeInt(this.offset.getY());