GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix Custom Model Data not working on Potions. (#3616)

Browse source
This commit is contained in:
Tydium 2023-03-28 14:35:22 -04:00 committed by GitHub
parent 2a8d8b6cdf
commit 45e043c6e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/src/main/java/org/geysermc/geyser/translator/inventory/item/PotionTranslator.java
View file

@ -48,15 +48,23 @@ public class PotionTranslator extends ItemTranslator {
if (itemStack.getNbt() == null) return super.translateToBedrock(itemStack, mapping, mappings); if (itemStack.getNbt() == null) return super.translateToBedrock(itemStack, mapping, mappings);
Tag potionTag = itemStack.getNbt().get("Potion"); Tag potionTag = itemStack.getNbt().get("Potion");
if (potionTag instanceof StringTag) { if (potionTag instanceof StringTag) {
Potion potion = Potion.getByJavaIdentifier(((StringTag) potionTag).getValue()); int customItemId = CustomItemTranslator.getCustomItem(itemStack.getNbt(), mapping);
if (potion != null) { if (customItemId == -1) {
Potion potion = Potion.getByJavaIdentifier(((StringTag) potionTag).getValue());
if (potion != null) {
return ItemData.builder()
.id(mapping.getBedrockId())
.damage(potion.getBedrockId())
.count(itemStack.getAmount())
.tag(translateNbtToBedrock(itemStack.getNbt()));
}
GeyserImpl.getInstance().getLogger().debug("Unknown Java potion: " + potionTag.getValue());
} else {
return ItemData.builder() return ItemData.builder()
.id(mapping.getBedrockId()) .id(customItemId)
.damage(potion.getBedrockId())
.count(itemStack.getAmount()) .count(itemStack.getAmount())
.tag(translateNbtToBedrock(itemStack.getNbt())); .tag(translateNbtToBedrock(itemStack.getNbt()));
} }
GeyserImpl.getInstance().getLogger().debug("Unknown Java potion: " + potionTag.getValue());
} }
return super.translateToBedrock(itemStack, mapping, mappings); return super.translateToBedrock(itemStack, mapping, mappings);
} }