From 0dc0b7303c57d7176b8ee8fd0ecd565f20be6a10 Mon Sep 17 00:00:00 2001
From: filoghost <filoghost@gmail.com>
Date: Mon, 21 Nov 2016 21:23:01 +0100
Subject: [PATCH] Don't display {"text":"..."} for MOTD in Minecraft 1.9+

---
 .../bungeecord/serverpinger/PingResponse.java       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/bridge/bungeecord/serverpinger/PingResponse.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/bridge/bungeecord/serverpinger/PingResponse.java
index b487fb7c..cdf4d9e9 100644
--- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/bridge/bungeecord/serverpinger/PingResponse.java
+++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/bridge/bungeecord/serverpinger/PingResponse.java
@@ -43,9 +43,18 @@ public class PingResponse
     	Object descriptionObject = json.get("description");
     	
     	if (descriptionObject != null) {
-    		motd = descriptionObject.toString();
+    		if (descriptionObject instanceof JSONObject) {
+    			Object text = ((JSONObject) descriptionObject).get("text");
+    			if (text != null) {
+    				motd = text.toString();
+    			} else {
+    				motd = "Invalid ping response (text not found)";
+    			}
+    		} else {
+    			motd = descriptionObject.toString();
+    		}
     	} else {
-    		motd = "Invalid ping response";
+    		motd = "Invalid ping response (description not found)";
     		DebugHandler.logToConsole("Received invalid Json response from IP \"" + address.toString() + "\": " + jsonString);
     	}