aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java
diff options
context:
space:
mode:
authorMoulberry <james.jenour@student.scotch.wa.edu.au>2020-10-19 02:06:15 +1100
committerMoulberry <james.jenour@student.scotch.wa.edu.au>2020-10-19 02:06:15 +1100
commit7ebee833e54e95ffcd9dcfbad5744e299102acd9 (patch)
treeddec55c308357f6ed92cb55408353ec40d702595 /src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java
parenta0402708801b525145d01d0f4da17f0ba9d93455 (diff)
downloadnotenoughupdates-7ebee833e54e95ffcd9dcfbad5744e299102acd9.tar.gz
notenoughupdates-7ebee833e54e95ffcd9dcfbad5744e299102acd9.tar.bz2
notenoughupdates-7ebee833e54e95ffcd9dcfbad5744e299102acd9.zip
1.4.2
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java
index b647fb1c..2d594ccf 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java
@@ -53,10 +53,13 @@ public class SBInfo {
if(event.message.getUnformattedText().startsWith("{")) {
try {
JsonObject obj = NotEnoughUpdates.INSTANCE.manager.gson.fromJson(event.message.getUnformattedText(), JsonObject.class);
- if(obj.has("server") && obj.has("gametype") && obj.has("mode") && obj.has("map")) {
- locraw = obj;
+ if(obj.has("server")) {
event.setCanceled(true);
+ if(obj.has("gametype") && obj.has("mode") && obj.has("map")) {
+ locraw = obj;
+ }
}
+
} catch(Exception e) {
e.printStackTrace();
}