Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-02 08:39:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix empty compound reading

Browse Source
This commit is contained in:
KennyTV 2020-08-13 08:31:06 +02:00
parent 0ec1116a9e
commit b0fc931ecd
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/us/myles/ViaVersion/api/minecraft/nbt/TagStringReader.java
View File

@ -65,6 +65,11 @@ import java.util.stream.IntStream;
public CompoundTag compound() throws StringTagParseException { public CompoundTag compound() throws StringTagParseException {
this.buffer.expect(Tokens.COMPOUND_BEGIN); this.buffer.expect(Tokens.COMPOUND_BEGIN);
final CompoundTag compoundTag = new CompoundTag(""); final CompoundTag compoundTag = new CompoundTag("");
if (this.buffer.peek() == Tokens.COMPOUND_END) {
this.buffer.take();
return compoundTag;
}
while (this.buffer.hasMore()) { while (this.buffer.hasMore()) {
final String key = this.key(); final String key = this.key();
final Tag tag = this.tag(); final Tag tag = this.tag();

5
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java
View File

@ -39,10 +39,9 @@ public class ComponentRewriter1_13 extends ComponentRewriter {
CompoundTag tag; CompoundTag tag;
try { try {
tag = BinaryTagIO.readString(text); tag = BinaryTagIO.readString(text);
} catch (IOException e) { } catch (Exception e) {
Via.getPlatform().getLogger().warning("Error reading NBT in show_item:" + text); Via.getPlatform().getLogger().warning("Error reading NBT in show_item:" + text);
e.printStackTrace(); throw new RuntimeException(e);
return;
} }
CompoundTag itemTag = tag.get("tag"); CompoundTag itemTag = tag.get("tag");