Merge 8eeee6f into 4d0c780

FragLand · Sep 11, 2021 · b26787b · b26787b
2 parents 4d0c780 + 8eeee6f
commit b26787b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/PHP/composer.json b/PHP/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "fragland/minestat",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "type": "library",
   "description": "A Minecraft server status checker",
   "keywords": ["Minecraft","status"],

diff --git a/PHP/minestat.php b/PHP/minestat.php
@@ -21,7 +21,7 @@
 
 class MineStat
 {
-  const VERSION = "2.2.0";     // MineStat version
+  const VERSION = "2.2.1";     // MineStat version
   const NUM_FIELDS = 6;        // number of values expected from server
   const NUM_FIELDS_BETA = 3;   // number of values expected from a 1.8b/1.3 server
   const MAX_VARINT_SIZE = 5;   // maximum number of bytes a varint can be
@@ -124,14 +124,21 @@ private function strip_motd($is_json = false)
       $this->stripped_motd = preg_replace("/§./", "", $this->motd);
     else
     {
-      $this->stripped_motd = $this->motd['text'];
-      $json_data = $this->motd['extra'];
-      if(!empty($json_data))
+      if(isset($this->motd['text']))
+        $this->stripped_motd = $this->motd['text'];
+      else
+        $this->stripped_motd = $this->motd;
+      if(isset($this->motd['extra']))
       {
-        foreach($json_data as &$nested_hash)
-          $this->stripped_motd .= $nested_hash['text'];
+        $json_data = $this->motd['extra'];
+        if(!empty($json_data))
+        {
+          foreach($json_data as &$nested_hash)
+            $this->stripped_motd .= $nested_hash['text'];
+        }
       }
-      $this->motd = json_encode($this->motd);
+      if(is_array($this->motd))
+        $this->motd = json_encode($this->motd);
       $this->stripped_motd = preg_replace("/§./", "", $this->stripped_motd);
     }
   }