Don't send tags for custom skulls

Signed-off-by: GitHub <[email protected]>
Kas-tle · Nov 1, 2023 · 2c0728c · 2c0728c
1 parent df48bca
commit 2c0728c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java b/...org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java
@@ -431,9 +431,6 @@ public void translate(GeyserSession session, ClientboundLevelChunkWithLightPacke
                     continue;
                 }
 
-                BlockEntityTranslator blockEntityTranslator = BlockEntityUtils.getBlockEntityTranslator(entity.type);
-                bedrockBlockEntities.add(blockEntityTranslator.getBlockEntityTag(session, entity.type, pos.getX(), pos.getY(), pos.getZ(), tag, entity.javaId));
-
                 // Check for custom skulls
                 if (session.getPreferencesCache().showCustomSkulls() && entity.type == "Skull" && tag != null && tag.contains("SkullOwner")) {
                     BlockDefinition blockDefinition = SkullBlockEntityTranslator.translateSkull(session, tag, pos, entity.javaId);
@@ -450,9 +447,13 @@ public void translate(GeyserSession session, ClientboundLevelChunkWithLightPacke
                                 sections[bedrockSectionY] = bedrockSection;
                             }
                             bedrockSection.setFullBlock(pos.getX() & 0xF, pos.getY() & 0xF, pos.getZ() & 0xF, 0, blockDefinition.getRuntimeId());
+                            continue;
                         }
                     }
                 }
+
+                BlockEntityTranslator blockEntityTranslator = BlockEntityUtils.getBlockEntityTranslator(entity.type);
+                bedrockBlockEntities.add(blockEntityTranslator.getBlockEntityTag(session, entity.type, pos.getX(), pos.getY(), pos.getZ(), tag, entity.javaId));
             }
 
             // Find highest section