From 318e23cedb9fa2bb7bf1c652b2c85cea6d041b16 Mon Sep 17 00:00:00 2001 From: bundabrg Date: Thu, 2 Jul 2020 21:38:08 +0800 Subject: [PATCH] V1.16 now uses "SkullOwner" instead of "Owner" for a BlockEntity --- .../world/block/entity/SkullBlockEntityTranslator.java | 4 ++-- .../main/java/org/geysermc/connector/utils/ChunkUtils.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java index bf20fce9a1b..494d1b4b6ed 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java @@ -83,8 +83,8 @@ public CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) { } public static GameProfile getProfile(com.github.steveice10.opennbt.tag.builtin.CompoundTag tag, GeyserSession session) { - if (tag.contains("Owner")) { - com.github.steveice10.opennbt.tag.builtin.CompoundTag owner = tag.get("Owner"); + if (tag.contains("SkullOwner")) { + com.github.steveice10.opennbt.tag.builtin.CompoundTag owner = tag.get("SkullOwner"); com.github.steveice10.opennbt.tag.builtin.CompoundTag Properties = owner.get("Properties"); ListTag textures = Properties.get("textures"); diff --git a/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java b/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java index f119f0cd7cd..03b9c9a1691 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java @@ -162,8 +162,8 @@ public static ChunkData translateToBedrock(Column column, GeyserSession session) bedrockBlockEntities[i] = blockEntityTranslator.getBlockEntityTag(tagName, tag, blockState); //Check for custom skulls - if (tag.contains("Owner") && SkullBlockEntityTranslator.ALLOW_CUSTOM_SKULLS) { - CompoundTag owner = tag.get("Owner"); + if (tag.contains("SkullOwner") && SkullBlockEntityTranslator.ALLOW_CUSTOM_SKULLS) { + CompoundTag owner = tag.get("SkullOwner"); if (owner.contains("Properties")) { SkullBlockEntityTranslator.spawnPlayer(session, tag, blockState); }