From a42b11361883fa06a95442877019275a8882436f Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 3 Mar 2016 23:40:09 +0000 Subject: [PATCH] Use new JSONParsers or they all implode. --- .../ViaVersion/transformers/OutgoingTransformer.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java index 79b593799..b08c40a9c 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java @@ -26,8 +26,6 @@ import java.util.*; import static us.myles.ViaVersion.util.PacketUtil.*; public class OutgoingTransformer { - private static JSONParser parser = new JSONParser(); - private final ConnectionInfo info; private final ViaVersionPlugin plugin = (ViaVersionPlugin) ViaVersion.getInstance(); private boolean cancel = false; @@ -240,7 +238,7 @@ public class OutgoingTransformer { if (packet == PacketType.STATUS_RESPONSE) { String original = PacketUtil.readString(input); try { - JSONObject json = (JSONObject) parser.parse(original); + JSONObject json = (JSONObject) new JSONParser().parse(original); JSONObject version = (JSONObject) json.get("version"); version.put("protocol", info.getProtocol()); PacketUtil.writeString(json.toJSONString(), output); @@ -597,9 +595,9 @@ public class OutgoingTransformer { line = "{\"text\":" + line + "}"; } try { - parser.parse(line); - } catch (org.json.simple.parser.ParseException e) { - System.out.println("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github!"); + new JSONParser().parse(line); + } catch (Exception e) { + System.out.println("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github: " + e.getMessage()); return "{\"text\":\"\"}"; } return line;