1 files changed, 7 insertions(+), 9 deletions(-)

M mcstatus.go

@@ 5,6 5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"strings"
 	"time"
 )
 


@@ 36,10 37,9 @@ type Server struct {
 
 // Minecraft values
 type Minecraft struct {
-	Map, Software, Version    string
-	PlayersOnline, PlayersMax int
-
-	MOTD, Players, Plugins []string
+	Map, Software, Version, MOTD string
+	PlayersOnline, PlayersMax    int
+	Players, Plugins             []string
 }
 
 // Debug values


@@ 152,14 152,12 @@ func (s *Status) UnmarshalJSON(b []byte) error {
 			Map:      r.Map,
 			Software: r.Software,
 			Version:  r.Version,
+			MOTD:     strings.Join(r.MOTD.Clean, "\n"),
 
 			PlayersOnline: r.Players.Online,
 			PlayersMax:    r.Players.Max,
-
-			Players: r.Players.List,
-			Plugins: r.Plugins.Raw, // TODO
-			MOTD:    r.MOTD.Clean,  // TODO
-
+			Players:       r.Players.List,
+			Plugins:       r.Plugins.Names,
 		},
 
 		Debug{