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

Don't throw an exception on hover parse failure

Browse Source
This commit is contained in:
KennyTV 2021-04-11 13:35:53 +02:00
parent 4473f863c6
commit 0ee80dc41f
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java
View File

@ -129,7 +129,7 @@ public class TagRewriter {
}; };
} }
public void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, List<TagData> newTags) throws Exception { public void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, @Nullable List<TagData> newTags) throws Exception {
int tagsSize = wrapper.read(Type.VAR_INT); int tagsSize = wrapper.read(Type.VAR_INT);
wrapper.write(Type.VAR_INT, newTags != null ? tagsSize + newTags.size() : tagsSize); // add new tags count wrapper.write(Type.VAR_INT, newTags != null ? tagsSize + newTags.size() : tagsSize); // add new tags count

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

@ -58,8 +58,11 @@ public class ComponentRewriter1_13 extends ComponentRewriter {
try { try {
tag = BinaryTagIO.readString(text); tag = BinaryTagIO.readString(text);
} catch (Exception e) { } catch (Exception e) {
Via.getPlatform().getLogger().warning("Error reading NBT in show_item:" + text); if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
throw new RuntimeException(e); Via.getPlatform().getLogger().warning("Error reading NBT in show_item:" + text);
e.printStackTrace();
}
return;
} }
CompoundTag itemTag = tag.get("tag"); CompoundTag itemTag = tag.get("tag");

5
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
View File

@ -24,6 +24,7 @@ import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.protocol.ClientboundPacketType; import us.myles.ViaVersion.api.protocol.ClientboundPacketType;
import us.myles.ViaVersion.api.protocol.Protocol; import us.myles.ViaVersion.api.protocol.Protocol;
import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.PacketRemapper;
import us.myles.ViaVersion.api.rewriters.MetadataRewriter;
import us.myles.ViaVersion.api.rewriters.RegistryType; import us.myles.ViaVersion.api.rewriters.RegistryType;
import us.myles.ViaVersion.api.rewriters.SoundRewriter; import us.myles.ViaVersion.api.rewriters.SoundRewriter;
import us.myles.ViaVersion.api.rewriters.StatisticsRewriter; import us.myles.ViaVersion.api.rewriters.StatisticsRewriter;
@ -50,7 +51,7 @@ public class Protocol1_17To1_16_4 extends Protocol<ClientboundPackets1_16_2, Cli
@Override @Override
protected void registerPackets() { protected void registerPackets() {
new MetadataRewriter1_17To1_16_4(this); MetadataRewriter metadataRewriter = new MetadataRewriter1_17To1_16_4(this);
EntityPackets.register(this); EntityPackets.register(this);
InventoryPackets.register(this); InventoryPackets.register(this);
@ -87,7 +88,7 @@ public class Protocol1_17To1_16_4 extends Protocol<ClientboundPackets1_16_2, Cli
} }
}); });
new StatisticsRewriter(this, null).register(ClientboundPackets1_16_2.STATISTICS); new StatisticsRewriter(this, metadataRewriter::getNewEntityId).register(ClientboundPackets1_16_2.STATISTICS);
SoundRewriter soundRewriter = new SoundRewriter(this); SoundRewriter soundRewriter = new SoundRewriter(this);
soundRewriter.registerSound(ClientboundPackets1_16_2.SOUND); soundRewriter.registerSound(ClientboundPackets1_16_2.SOUND);