GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Code Issues Releases Activity

Fixed invalid recipe (non-vanilla items) (#5596)

Browse Source 
* Fixed invalid recipe (non-vanilla item).

* Added comments.
This commit is contained in:
oryxel
2025-06-30 16:37:44 +07:00
committed by GitHub
parent a768be3ed4
commit 0e3a7cfd9d
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeBookAddTranslator.java
View File

@@ -310,6 +310,12 @@ public class JavaRecipeBookAddTranslator extends PacketTranslator<ClientboundRec
return ItemDescriptorWithCount.EMPTY; return ItemDescriptorWithCount.EMPTY;
} }
ItemMapping mapping = session.getItemMappings().getMapping(item); ItemMapping mapping = session.getItemMappings().getMapping(item);
// This is likely a modded java item or some item Geyser haven't mapped.
if (mapping.getJavaItem().javaId() == Items.AIR_ID) {
return ItemDescriptorWithCount.EMPTY;
}
return new ItemDescriptorWithCount(new DefaultDescriptor(mapping.getBedrockDefinition(), mapping.getBedrockData()), 1); // Need to check count return new ItemDescriptorWithCount(new DefaultDescriptor(mapping.getBedrockDefinition(), mapping.getBedrockData()), 1); // Need to check count
} }
@@ -362,6 +368,12 @@ public class JavaRecipeBookAddTranslator extends PacketTranslator<ClientboundRec
if (translated == null) { if (translated == null) {
continue; continue;
} }
// As of 1.21.82, Bedrock will crash if we tried to send invalid descriptor.
if (translated.contains(ItemDescriptorWithCount.EMPTY)) {
continue;
}
inputs.add(translated); inputs.add(translated);
if (translated.size() != 1 || translated.get(0) != ItemDescriptorWithCount.EMPTY) { if (translated.size() != 1 || translated.get(0) != ItemDescriptorWithCount.EMPTY) {
empty = false; empty = false;