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

Allow custom unusable-space blocker item (#4038)

Browse source 
* Allow the "unusable-space-block" to be a custom item (specified by bedrock identifier)

* add space for log error

* don't use ugly atomic reference
This commit is contained in:
chris 2023-08-07 02:22:05 +02:00 committed by GitHub
parent 176ef83ed1
commit b1f04a9012
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java
View file

@ -208,12 +208,21 @@ public class InventoryUtils {
private static ItemDefinition getUnusableSpaceBlockDefinition(int protocolVersion) { private static ItemDefinition getUnusableSpaceBlockDefinition(int protocolVersion) {
String unusableSpaceBlock = GeyserImpl.getInstance().getConfig().getUnusableSpaceBlock(); String unusableSpaceBlock = GeyserImpl.getInstance().getConfig().getUnusableSpaceBlock();
ItemMapping unusableSpaceBlockID = Registries.ITEMS.forVersion(protocolVersion).getMapping(unusableSpaceBlock); ItemDefinition itemDefinition = null;
if (unusableSpaceBlockID != null) {
return unusableSpaceBlockID.getBedrockDefinition(); // looping through all the items to find the one with the specified Bedrock identifier
} else { for (ItemDefinition definition : Registries.ITEMS.forVersion(protocolVersion).getItemDefinitions().values()) {
GeyserImpl.getInstance().getLogger().error("Invalid value" + unusableSpaceBlock + ". Resorting to barrier block."); if (definition.getIdentifier().equals(unusableSpaceBlock)) {
itemDefinition = definition;
break;
}
}
if (itemDefinition == null) {
GeyserImpl.getInstance().getLogger().error("Invalid value " + unusableSpaceBlock + ". Resorting to barrier block.");
return Registries.ITEMS.forVersion(protocolVersion).getStoredItems().barrier().getBedrockDefinition(); return Registries.ITEMS.forVersion(protocolVersion).getStoredItems().barrier().getBedrockDefinition();
} else {
return itemDefinition;
} }
} }