From 140a7dc72b6c89fa88ebef49fbac38dad984cf81 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:27:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0GM=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/admin.go | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/server/game/admin.go b/src/server/game/admin.go
index 77a29ba0..5380ea10 100644
--- a/src/server/game/admin.go
+++ b/src/server/game/admin.go
@@ -69,18 +69,15 @@ func AdminPlayerInfo(args []interface{}) error {
 		Index++
 	}
 	res["Order"] = OrderMap
-	JsonBuff, err := json.Marshal(res)
-	if err != nil {
-		return err
-	}
-	AdminPlayerBack(a, JsonBuff)
+	AdminPlayerBack(a, res)
 	return nil
 }
 
-func AdminPlayerBack(a gate.Agent, buf []byte) {
+func AdminPlayerBack(a gate.Agent, res map[string]interface{}) {
+	JsonBuff, _ := json.Marshal(res)
 	response := &msg.AdminRes{}
 	response.Func = "admin"
-	response.Info = buf
+	response.Info = JsonBuff
 	a.WriteMsg(response)
 }
 
@@ -89,11 +86,7 @@ func ReqServerInfo(args []interface{}) error {
 	res := make(map[string]interface{})
 	res["PlayerNum"] = G_GameLogicPtr.GetPlayerNum()
 	res["StartTime"] = G_GameLogicPtr.GetStartTime()
-	JsonBuff, err := json.Marshal(res)
-	if err != nil {
-		return err
-	}
-	AdminPlayerBack(a, JsonBuff)
+	AdminPlayerBack(a, res)
 	return nil
 }
 
@@ -108,11 +101,7 @@ func ReqReload(args []interface{}) error {
 	gamedata.Reload()
 	res := make(map[string]interface{})
 	res["Code"] = 0
-	JsonBuff, err := json.Marshal(res)
-	if err != nil {
-		return err
-	}
-	AdminPlayerBack(a, JsonBuff)
+	AdminPlayerBack(a, res)
 	return nil
 }
 
@@ -120,24 +109,30 @@ func ReqAdminGm(args []interface{}) error {
 	a, buf := ParseAdminArgs(args)
 	req := &msg.ReqAdminGm{}
 	proto.Unmarshal(buf, req)
+	res := make(map[string]interface{})
+	res["Code"] = 0
+	res["Msg"] = "ok"
 	player := G_GameLogicPtr.GetPlayer(req.Uid)
 	if player == nil {
+		res["Code"] = 1
+		res["Msg"] = "player not found"
+		AdminPlayerBack(a, nil)
 		return nil
 	}
 	player.lock.Lock()
 	defer player.lock.Unlock()
 	err := ReqGmCommand_(player, req.Command)
-	res := make(map[string]interface{})
-	res["Code"] = 0
-	res["Msg"] = "ok"
+
 	if err != nil {
 		res["Code"] = 1
 		res["Msg"] = err.Error()
 	}
-	JsonBuff, err := json.Marshal(res)
 	if err != nil {
+		res["Code"] = 1
+		res["Msg"] = err.Error()
+		AdminPlayerBack(a, res)
 		return err
 	}
-	AdminPlayerBack(a, JsonBuff)
+	AdminPlayerBack(a, res)
 	return nil
 }