From 2d2018b8d0729b3fbfed86abc666c63d66322497 Mon Sep 17 00:00:00 2001 From: Myles Date: Sun, 6 Mar 2016 15:10:54 +0000 Subject: [PATCH] Disable latest feature due to it breaking signs (no more sync chunks for now) --- .../us/myles/ViaVersion/handlers/ViaEncodeHandler.java | 8 ++++---- .../ViaVersion/transformers/OutgoingTransformer.java | 3 +-- src/main/resources/config.yml | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java b/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java index 7ee679bb5..872d6ad7e 100644 --- a/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java +++ b/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java @@ -67,11 +67,11 @@ public class ViaEncodeHandler extends MessageToByteEncoder { } }; // Synced allows timings to work properly. - if (ViaVersion.getInstance().isSyncedChunks()) { - ((ViaVersionPlugin) ViaVersion.getInstance()).run(chunks, false); - } else { +// if (ViaVersion.getInstance().isSyncedChunks()) { +// ((ViaVersionPlugin) ViaVersion.getInstance()).run(chunks, false); +// } else { chunks.run(); - } +// } bytebuf.readBytes(bytebuf.readableBytes()); throw new CancelException(); } diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java index b41385f9c..968ff4ffc 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java @@ -727,9 +727,8 @@ public class OutgoingTransformer { } else { if ((!line.startsWith("\"") || !line.endsWith("\"")) && (!line.startsWith("{")|| !line.endsWith("}"))) { JSONObject obj = new JSONObject(); - obj.put("text", line); - line = obj.toJSONString(); + return obj.toJSONString(); } if (line.startsWith("\"") && line.endsWith("\"")) { line = "{\"text\":" + line + "}"; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 3f4712790..45650f42a 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,4 +1,5 @@ # Should ViaVersion check for updates? checkforupdates: true # Should we send any bulk chunks, in sync (may be slower but fixes timings) +# Currently broken due to sign updates, possibly will return sync-chunks: true