From 1676a76498d05c89dfcc681ead5cf3ab94244587 Mon Sep 17 00:00:00 2001 From: bundabrg Date: Wed, 17 Feb 2021 12:02:43 +0800 Subject: [PATCH] Only add custom name to item if none already exist Relates to: https://github.com/bundabrg/GeyserReversion/issues/36 --- .../grieve/reversion/editions/bedrock/mappers/ItemMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/editions/edition-bedrock/src/main/java/au/com/grieve/reversion/editions/bedrock/mappers/ItemMapper.java b/editions/edition-bedrock/src/main/java/au/com/grieve/reversion/editions/bedrock/mappers/ItemMapper.java index bf0b95f..efe91db 100644 --- a/editions/edition-bedrock/src/main/java/au/com/grieve/reversion/editions/bedrock/mappers/ItemMapper.java +++ b/editions/edition-bedrock/src/main/java/au/com/grieve/reversion/editions/bedrock/mappers/ItemMapper.java @@ -481,7 +481,8 @@ public ItemData mapItemDataToUpstream(ItemData item, boolean creativeOnly) { NbtMap tag = translated.getTag(); - if (itemMapperEntry.getUpstream().getCustomName() != null) { + // Rename item if no existing name is set + if (itemMapperEntry.getUpstream().getCustomName() != null && (tag == null || !tag.containsKey("display"))) { NbtMapBuilder tagBuilder = tag != null ? tag.toBuilder() : NbtMap.builder(); tagBuilder.putCompound("display", NbtMap.builder().putString("Name", itemMapperEntry.getUpstream().getCustomName()).build());