From 72ae12bc774e96ba930f2f06d2d6e60ca2faa250 Mon Sep 17 00:00:00 2001 From: HugoDaBosss Date: Thu, 3 Mar 2016 10:44:57 +0100 Subject: [PATCH 1/6] Don't send malformed JSON anymore, preventing kicks. --- .../ViaVersion/transformers/OutgoingTransformer.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java index ceda3a0f8..87ed7b87a 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java @@ -2,10 +2,14 @@ package us.myles.ViaVersion.transformers; import com.google.gson.Gson; import com.google.gson.JsonObject; + import io.netty.buffer.ByteBuf; + import org.bukkit.entity.EntityType; +import org.json.simple.parser.JSONParser; import org.spacehq.mc.protocol.data.game.chunk.Column; import org.spacehq.mc.protocol.util.NetUtil; + import us.myles.ViaVersion.CancelException; import us.myles.ViaVersion.ConnectionInfo; import us.myles.ViaVersion.ViaVersionPlugin; @@ -487,6 +491,13 @@ public class OutgoingTransformer { if (line.startsWith("\"")) line = "{\"text\":" + line + "}"; } + try { + new JSONParser().parse(line); + } + catch (org.json.simple.parser.ParseException e) { + System.out.println("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github!"); + return "{\"text\":\"\"}"; + } return line; } From ff0544f29a664733042a4148d768ec8a0bfd68ed Mon Sep 17 00:00:00 2001 From: HugoDaBosss Date: Thu, 3 Mar 2016 10:46:38 +0100 Subject: [PATCH 2/6] Eclipse is changing my bracket markup x.x --- .../us/myles/ViaVersion/transformers/OutgoingTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java index 87ed7b87a..04d1c45ec 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java @@ -497,7 +497,7 @@ public class OutgoingTransformer { catch (org.json.simple.parser.ParseException e) { System.out.println("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github!"); return "{\"text\":\"\"}"; - } + } return line; } From 854e24f8fc1fea789bc952149a64f4c0fd8ca640 Mon Sep 17 00:00:00 2001 From: HugoDaBosss Date: Thu, 3 Mar 2016 10:47:22 +0100 Subject: [PATCH 3/6] More formatting --- .../us/myles/ViaVersion/transformers/OutgoingTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java index 04d1c45ec..75d5c3da7 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java @@ -496,7 +496,7 @@ public class OutgoingTransformer { } catch (org.json.simple.parser.ParseException e) { System.out.println("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github!"); - return "{\"text\":\"\"}"; + return "{\"text\":\"\"}"; } return line; } From b10aa30d9b147548c3d189527fd5a913b6e62d25 Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 3 Mar 2016 10:24:01 +0000 Subject: [PATCH 4/6] Change error correction to use super, should restore default functionality to errors. --- .../ViaVersion/handlers/ViaDecodeHandler.java | 14 ++++---------- .../ViaVersion/handlers/ViaEncodeHandler.java | 12 ++++-------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java b/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java index ad39cd125..0a2d0f735 100644 --- a/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java +++ b/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java @@ -8,7 +8,6 @@ import us.myles.ViaVersion.ConnectionInfo; import us.myles.ViaVersion.transformers.IncomingTransformer; import us.myles.ViaVersion.util.PacketUtil; -import java.nio.channels.ClosedChannelException; import java.util.List; public class ViaDecodeHandler extends ByteToMessageDecoder { @@ -45,15 +44,10 @@ public class ViaDecodeHandler extends ByteToMessageDecoder { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { - if (!(cause.getCause().getCause() instanceof CancelException) - && !(cause.getCause().getCause() instanceof ClosedChannelException)) { - if (!(cause.getCause() instanceof CancelException) - && !(cause.getCause() instanceof ClosedChannelException)) { - if (!(cause instanceof CancelException) - && !(cause instanceof ClosedChannelException)) { - if (cause instanceof Exception){ - cause.printStackTrace(); - } + if (!(cause.getCause().getCause() instanceof CancelException)) { + if (!(cause.getCause() instanceof CancelException)) { + if (!(cause instanceof CancelException)) { + super.exceptionCaught(ctx, cause); } } } diff --git a/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java b/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java index 4cc88c572..dac12dc59 100644 --- a/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java +++ b/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java @@ -72,14 +72,10 @@ public class ViaEncodeHandler extends MessageToByteEncoder { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { - if (!(cause.getCause().getCause() instanceof CancelException) - && !(cause.getCause().getCause() instanceof ClosedChannelException)) { - if (!(cause.getCause() instanceof CancelException) - && !(cause.getCause() instanceof ClosedChannelException)) { - if (!(cause instanceof CancelException) - && !(cause instanceof ClosedChannelException)) { - if (cause instanceof Exception) - cause.printStackTrace(); + if (!(cause.getCause().getCause() instanceof CancelException)) { + if (!(cause.getCause() instanceof CancelException)) { + if (!(cause instanceof CancelException)) { + super.exceptionCaught(ctx, cause); } } } From 186ba22dc85c56936d86aea68b06373eb304c18b Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 3 Mar 2016 10:37:10 +0000 Subject: [PATCH 5/6] Update README with chat, and change issue template --- ISSUE_TEMPLATE.md | 9 +++++++++ README.md | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..a7c3d4357 --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,9 @@ +### What version of ViaVersion are you using? Type /ver viaversion + +### What version of Spigot are you using? Type /ver + +### What plugins are you using? /plugins + +### How does this error happen? login? using an item? + +### Is there an error in the console? Use pastebin.com. Is there a kick message? \ No newline at end of file diff --git a/README.md b/README.md index 4bd878f48..d45e9ae53 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,16 @@ Contributors: **Paulomart** **gigosaurus** +**Chat: ** https://gitter.im/MylesIsCool/ViaVersion + +We use it to collaborate and solve errors, sign in with github. + License: -------- You may modify this work, all rights are still owned by myself excluding any files in the spacebase package as they belong to the respected contributors. Please credit the original author (myself) when forking etc. (or if it helped you understand the new protocol or netty!) -Thanks! \ No newline at end of file +Thanks! + + From aa70ab8b78d111e00c47abcab3720baaeac3cce2 Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 3 Mar 2016 10:37:43 +0000 Subject: [PATCH 6/6] Extra line --- ISSUE_TEMPLATE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index a7c3d4357..1b785cc64 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -6,4 +6,5 @@ ### How does this error happen? login? using an item? -### Is there an error in the console? Use pastebin.com. Is there a kick message? \ No newline at end of file +### Is there an error in the console? Use pastebin.com. Is there a kick message? +