From ac9da9a5a02134afdbecdc05aa07d01e180cbe1f Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Tue, 13 Jul 2021 21:47:13 -0400 Subject: [PATCH] Fix flower pot updating --- .../connector/utils/BlockEntityUtils.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java b/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java index 97a5e90db..22e31240d 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java @@ -30,17 +30,16 @@ import com.nukkitx.math.vector.Vector3i; import com.nukkitx.nbt.NbtMap; import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.translators.world.block.entity.BedrockOnlyBlockEntity; import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator; +import org.geysermc.connector.network.translators.world.block.entity.FlowerPotBlockEntityTranslator; import org.geysermc.connector.registry.Registries; +import javax.annotation.Nonnull; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; - public class BlockEntityUtils { /** * A list of all block entities that require the Java block state in order to fill out their block entity information. @@ -65,15 +64,9 @@ public class BlockEntityUtils { private static final BlockEntityTranslator EMPTY_TRANSLATOR = Registries.BLOCK_ENTITIES.get("Empty"); static { - for (BlockEntityTranslator translator : Registries.BLOCK_ENTITIES.get().values()) { - if (!(translator instanceof BedrockOnlyBlockEntity)) { - continue; - } - - GeyserConnector.getInstance().getLogger().debug("Found Bedrock-only block entity: " + translator.getClass().getCanonicalName()); - BedrockOnlyBlockEntity bedrockOnlyBlockEntity = (BedrockOnlyBlockEntity) translator; - BEDROCK_ONLY_BLOCK_ENTITIES.add(bedrockOnlyBlockEntity); - } + // Seeing as there are only two - and, hopefully, will only ever be two - we can hardcode this + BEDROCK_ONLY_BLOCK_ENTITIES.add((BedrockOnlyBlockEntity) Registries.BLOCK_ENTITIES.get().get("Chest")); + BEDROCK_ONLY_BLOCK_ENTITIES.add(new FlowerPotBlockEntityTranslator()); } public static String getBedrockBlockEntityId(String id) {