From 321f98c75d820f260cf4fbe54419a031f988f1d6 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Wed, 26 Apr 2023 20:50:59 +0200 Subject: [PATCH] fix logs and fences in 1.19.80+ (#3698) --- .../registry/populator/ItemRegistryPopulator.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java index d2ef1bbf2..b41ec3d42 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java @@ -213,6 +213,18 @@ public class ItemRegistryPopulator { } else { bedrockIdentifier = mappingItem.getBedrockIdentifier(); } + + //1.19.80+ + if (palette.getValue().protocolVersion >= Bedrock_v582.CODEC.getProtocolVersion()) { + if (mappingItem.getBedrockIdentifier().equals("minecraft:log") || + mappingItem.getBedrockIdentifier().equals("minecraft:log2") || + mappingItem.getBedrockIdentifier().equals("minecraft:fence")) { + bedrockIdentifier = javaItem.javaIdentifier(); + } else { + bedrockIdentifier = mappingItem.getBedrockIdentifier(); + } + } + ItemDefinition definition = definitions.get(bedrockIdentifier); if (definition == null) { throw new RuntimeException("Missing Bedrock ItemDefinition in mappings: " + bedrockIdentifier);