GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Fix check for missing item mapping and update mappings submodule

This commit is contained in:
Redned 2021-07-18 12:47:02 -05:00 committed by RednedEpic
parent 697f35f657
commit fde36a2234
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java
View File

@ -120,6 +120,7 @@ public class ItemRegistryPopulator {
// Used to get the Bedrock namespaced ID (in instances where there are small differences)
Object2IntMap<String> bedrockIdentifierToId = new Object2IntOpenHashMap<>();
bedrockIdentifierToId.defaultReturnValue(Short.MIN_VALUE);
List<String> itemNames = new ArrayList<>();
@ -264,8 +265,8 @@ public class ItemRegistryPopulator {
}
String bedrockIdentifier = mappingItem.getBedrockIdentifier();
int bedrockId = bedrockIdentifierToId.getInt(bedrockIdentifier);
if (bedrockIdentifier == null) {
throw new RuntimeException("Missing Bedrock ID in mappings!: " + bedrockId);
if (bedrockId == Short.MIN_VALUE) {
throw new RuntimeException("Missing Bedrock ID in mappings: " + bedrockIdentifier);
}
int stackSize = mappingItem.getStackSize();

2
connector/src/main/resources/mappings

@ -1 +1 @@
Subproject commit c921aa9b12c2a1a471ef5f00aa040924426641dc
Subproject commit 8351b0f5bb6e9a1d614f84e18c91e82288c34bf6