Skip to content

Commit 01f28a0

Browse files
committed
Ignore errors in book conversion
1 parent cfc9011 commit 01f28a0

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPipelineImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,22 @@ public void transform(Direction direction, State state, PacketWrapper packetWrap
107107
int originalID = packetWrapper.getId();
108108

109109
DebugHandler debugHandler = Via.getManager().debugHandler();
110-
if (debugHandler.enabled() && !debugHandler.logPostPacketTransform() && debugHandler.shouldLog(packetWrapper, direction)) {
110+
boolean debug = debugHandler.enabled();
111+
if (debug && !debugHandler.logPostPacketTransform() && debugHandler.shouldLog(packetWrapper, direction)) {
111112
logPacket(direction, state, packetWrapper, originalID);
112113
}
113114

114115
// Apply protocols
115116
packetWrapper.apply(direction, state, 0, protocolListFor(direction));
116117
super.transform(direction, state, packetWrapper);
117118

118-
if (debugHandler.enabled() && debugHandler.logPostPacketTransform() && debugHandler.shouldLog(packetWrapper, direction)) {
119+
if (debug && debugHandler.logPostPacketTransform() && debugHandler.shouldLog(packetWrapper, direction)) {
119120
logPacket(direction, state, packetWrapper, originalID);
120121
}
121122
}
122123

123124
private List<Protocol> protocolListFor(final Direction direction) {
124-
return Collections.unmodifiableList(direction == Direction.SERVERBOUND ? protocolList : reversedProtocolList);
125+
return direction == Direction.SERVERBOUND ? protocolList : reversedProtocolList;
125126
}
126127

127128
private void logPacket(Direction direction, State state, PacketWrapper packetWrapper, int originalID) {

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.github.steveice10.opennbt.tag.builtin.StringTag;
2323
import com.github.steveice10.opennbt.tag.builtin.Tag;
2424
import com.google.gson.JsonElement;
25+
import com.viaversion.viaversion.api.Via;
2526
import com.viaversion.viaversion.api.data.ParticleMappings;
2627
import com.viaversion.viaversion.api.minecraft.Particle;
2728
import com.viaversion.viaversion.api.minecraft.item.Item;
@@ -160,8 +161,14 @@ private void updatePages(final CompoundTag tag, final String key) {
160161
}
161162

162163
final StringTag stringTag = (StringTag) pageTag;
163-
final JsonElement updatedComponent = ComponentUtil.convertJson(stringTag.getValue(), ComponentUtil.SerializerVersion.V1_19_4, ComponentUtil.SerializerVersion.V1_20_3);
164-
stringTag.setValue(updatedComponent.toString());
164+
try {
165+
final JsonElement updatedComponent = ComponentUtil.convertJson(stringTag.getValue(), ComponentUtil.SerializerVersion.V1_19_4, ComponentUtil.SerializerVersion.V1_20_3);
166+
stringTag.setValue(updatedComponent.toString());
167+
} catch (final Exception e) {
168+
if (Via.getManager().isDebug()) {
169+
e.printStackTrace();
170+
}
171+
}
165172
}
166173
}
167174
}

common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected EntityRewriter(T protocol, boolean trackMappedType) {
8282
/**
8383
* Returns a meta filter builder.
8484
* <p>
85-
* Calling {@link MetaFilter.Builder#register()} will automatically register the filter on this rewriter.
85+
* Calling {@link com.viaversion.viaversion.rewriter.meta.MetaFilter.Builder#register()} will automatically register the filter on this rewriter.
8686
*
8787
* @return meta filter builder
8888
*/
@@ -92,7 +92,7 @@ public MetaFilter.Builder filter() {
9292

9393
/**
9494
* Registers a metadata filter.
95-
* Note that {@link MetaFilter.Builder#register()} already calls this method.
95+
* Note that {@link com.viaversion.viaversion.rewriter.meta.MetaFilter.Builder#register()} already calls this method.
9696
*
9797
* @param filter filter to register
9898
* @throws IllegalArgumentException if the filter is already registered

0 commit comments

Comments
 (0)