Fixed the replay mod crash when viewing a replay --release snapshop

ChatTriggers · Jan 22, 2018 · 2f718e8 · 2f718e8
1 parent 501a57d
commit 2f718e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.6.2-SNAPSHOT"
+version = "0.6.3-SNAPSHOT"
 group = "com.chattriggers.ctjs" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "ctjs"
 

diff --git a/src/main/java/com/chattriggers/ctjs/Reference.java b/src/main/java/com/chattriggers/ctjs/Reference.java
@@ -5,7 +5,7 @@
 public class Reference {
     public static final String MODID = "ct.js";
     public static final String MODNAME = "ChatTriggers.js";
-    public static final String MODVERSION = "0.6.2-SNAPSHOT";
+    public static final String MODVERSION = "0.6.3-SNAPSHOT";
     public static final String MAPPINGURL = "http://export.mcpbot.bspk.rs/mcp_stable_nodoc/22-1.8.9/mcp_stable_nodoc-22-1.8.9.zip";
     public static final String SENTRYDSN = "https://a69c5c01577c457b88434de9b995ceec:317ddf76172b4020b80f79befe536f98@sentry.io/259416"
                     + "?release=" + MODVERSION

diff --git a/src/main/java/com/chattriggers/ctjs/minecraft/libs/MinecraftVars.java b/src/main/java/com/chattriggers/ctjs/minecraft/libs/MinecraftVars.java
@@ -390,7 +390,9 @@ public static String getServerMOTD() {
     public static Long getPing() {
         EntityPlayer player = getPlayer();
 
-        if (player == null || getMinecraft().isSingleplayer()) {
+        if (player == null
+                || getMinecraft().isSingleplayer()
+                || getMinecraft().getCurrentServerData() == null) {
             return 5L;
         }
 

diff --git a/src/main/java/com/chattriggers/ctjs/minecraft/wrappers/Server.java b/src/main/java/com/chattriggers/ctjs/minecraft/wrappers/Server.java
@@ -46,7 +46,9 @@ public static String getMOTD() {
     public static Long getPing() {
         EntityPlayer player = Player.getPlayer();
 
-        if (player == null || Client.getMinecraft().isSingleplayer()) {
+        if (player == null
+                || Client.getMinecraft().isSingleplayer()
+                || Client.getMinecraft().getCurrentServerData() == null) {
             return 5L;
         }