From fe5925c9319a3a656d2e28e453c6e0fdc359cecf Mon Sep 17 00:00:00 2001 From: jhqwqmc Date: Sun, 12 Oct 2025 12:52:39 +0800 Subject: [PATCH] hotfix --- .../bukkit/entity/data/AbstractMinecartData.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/AbstractMinecartData.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/AbstractMinecartData.java index c0b8a6202..d5b78f05e 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/AbstractMinecartData.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/AbstractMinecartData.java @@ -7,13 +7,13 @@ import net.momirealms.craftengine.core.util.VersionHelper; import java.util.Optional; public class AbstractMinecartData extends VehicleEntityData { - // 1.20~1.21.2 - public static final AbstractMinecartData DisplayBlock = of(AbstractMinecartData.class, EntityDataValue.Serializers$INT, BlockStateUtils.blockStateToId(MBlocks.AIR$defaultState), !VersionHelper.isOrAbove1_21_3()); - // 1.21.3+ - public static final AbstractMinecartData> CustomDisplayBlock = of(AbstractMinecartData.class, EntityDataValue.Serializers$OPTIONAL_BLOCK_STATE, Optional.empty(), VersionHelper.isOrAbove1_21_3()); + // 1.20~1.21.4 + public static final AbstractMinecartData DisplayBlock = of(AbstractMinecartData.class, EntityDataValue.Serializers$INT, BlockStateUtils.blockStateToId(MBlocks.AIR$defaultState), !VersionHelper.isOrAbove1_21_5()); + // 1.21.5+ + public static final AbstractMinecartData> CustomDisplayBlock = of(AbstractMinecartData.class, EntityDataValue.Serializers$OPTIONAL_BLOCK_STATE, Optional.empty(), VersionHelper.isOrAbove1_21_5()); public static final AbstractMinecartData DisplayOffset = of(AbstractMinecartData.class, EntityDataValue.Serializers$INT, 6, true); - // 1.20~1.21.2 - public static final AbstractMinecartData CustomDisplay = of(AbstractMinecartData.class, EntityDataValue.Serializers$BOOLEAN, false, !VersionHelper.isOrAbove1_21_3()); + // 1.20~1.21.4 + public static final AbstractMinecartData CustomDisplay = of(AbstractMinecartData.class, EntityDataValue.Serializers$BOOLEAN, false, !VersionHelper.isOrAbove1_21_5()); public static AbstractMinecartData of(final Class clazz, final Object serializer, T defaultValue, boolean condition) { if (!condition) return null;