Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-29 13:36:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77 from HugoDaBosss/patch-2

Browse Source 
Don't send malformed JSON anymore, preventing kicks.
This commit is contained in:
Myles 2016-03-03 10:04:54 +00:00
commit 615b9f847c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
View File

@ -2,10 +2,14 @@ package us.myles.ViaVersion.transformers;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import org.bukkit.entity.EntityType; 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.data.game.chunk.Column;
import org.spacehq.mc.protocol.util.NetUtil; import org.spacehq.mc.protocol.util.NetUtil;
import us.myles.ViaVersion.CancelException; import us.myles.ViaVersion.CancelException;
import us.myles.ViaVersion.ConnectionInfo; import us.myles.ViaVersion.ConnectionInfo;
import us.myles.ViaVersion.ViaVersionPlugin; import us.myles.ViaVersion.ViaVersionPlugin;
@ -492,6 +496,13 @@ public class OutgoingTransformer {
if (line.startsWith("\"")) if (line.startsWith("\""))
line = "{\"text\":" + line + "}"; 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; return line;
} }