From 66995cc63d407ffc1d5213aacddd195655fddaf4 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 14 Apr 2026 10:51:23 +0800
Subject: [PATCH] =?UTF-8?q?gm=E5=91=BD=E4=BB=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/gm_handler.go  | 6 +++++-
 src/server/game/player_data.go | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go
index bda7fa03..4dfbd304 100644
--- a/src/server/game/gm_handler.go
+++ b/src/server/game/gm_handler.go
@@ -529,7 +529,11 @@ func ReqGmCommand_(player *Player, Command string) error {
 	case "copyUser":
 		p1 := new(Player)
 		p1.M_DwUin = int64(GoUtil.Int(arg[1]))
-		p1.InitPlayerOnly()
+		err := p1.InitPlayerOnly()
+		if err != nil {
+			log.Error("failed to initialize player: %v", err)
+			return err
+		}
 		BaseMod := p1.PlayMod.getBaseMod()
 		BaseMod.Uid = player.M_DwUin
 		BaseMod.NickName = player.PlayMod.getBaseMod().NickName
diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go
index 4dba3fd2..2a8ec9d5 100644
--- a/src/server/game/player_data.go
+++ b/src/server/game/player_data.go
@@ -1052,7 +1052,7 @@ func (p *Player) LoginBackData() {
 	p.BackUserInfo()
 }
 
-func (p *Player) InitPlayerOnly() {
+func (p *Player) InitPlayerOnly() error {
 	p.lock.Lock()
 	defer p.lock.Unlock()
 	p.Msg = make([]PlayerMsg, 0)
@@ -1068,7 +1068,7 @@ func (p *Player) InitPlayerOnly() {
 	// 玩家基础数据
 	ok := Base.GetDataByUid(p.M_DwUin)
 	if !ok {
-		return
+		return errors.New("player base data load failed")
 	}
 	p.PlayerBaseMod = Base
 	p.M_DwUin = Base.Data.DwUin
@@ -1077,10 +1077,11 @@ func (p *Player) InitPlayerOnly() {
 	modData := &PlayerModData{PlayerData: NewPlayerData("PlayerModData", p)}
 	ok = modData.LoadDataFromDB(Base.Data.DwUin)
 	if !ok {
-		return
+		return errors.New("player mod data load failed")
 	}
 	modData.InitMod(p)
 	p.PlayMod.mod_list = modData.ModList
+	return nil
 }
 
 // 获取玩家简单数据