Only add custom name to item if none already exist

Relates to: bundabrg/GeyserReversion#36
bundabrg · Feb 17, 2021 · 1676a76 · 1676a76
1 parent 1d7e06a
commit 1676a76
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...on-bedrock/src/main/java/au/com/grieve/reversion/editions/bedrock/mappers/ItemMapper.java b/...on-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());