Google/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Check the name tag exists for anvil renaming to prevent an NPE (#936)

Browse source 
* Check the name tag exists for anvil renaming to prevent an NPE

* Fix item names being empty if display tag exists with no name
This commit is contained in:
rtm516 2020-07-11 21:58:12 +01:00 committed by GitHub
parent 7757913c00
commit 485ba1b8a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/network/translators/inventory/AnvilInventoryTranslator.java
View file

@ -136,7 +136,7 @@ public class AnvilInventoryTranslator extends BlockInventoryTranslator {
CompoundTag tag = item.getNbt(); CompoundTag tag = item.getNbt();
if (tag != null) { if (tag != null) {
CompoundTag displayTag = tag.get("display"); CompoundTag displayTag = tag.get("display");
if (displayTag != null) { if (displayTag != null && displayTag.contains("Name")) {
String itemName = displayTag.get("Name").getValue().toString(); String itemName = displayTag.get("Name").getValue().toString();
TextMessage message = (TextMessage) MessageSerializer.fromString(itemName); TextMessage message = (TextMessage) MessageSerializer.fromString(itemName);
rename = message.getText(); rename = message.getText();

2
connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
View file

@ -157,7 +157,7 @@ public abstract class ItemTranslator {
NbtMap tag = itemData.getTag(); NbtMap tag = itemData.getTag();
if (tag != null) { if (tag != null) {
NbtMap display = tag.getCompound("display"); NbtMap display = tag.getCompound("display");
if (display != null && !display.isEmpty()) { if (display != null && !display.isEmpty() && display.containsKey("Name")) {
String name = display.getString("Name"); String name = display.getString("Name");
// If its not a message convert it // If its not a message convert it