From 07935149a708d64cf2fad9e9a7c16074d874b3be Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Fri, 26 Dec 2025 16:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A6=E5=8F=B7=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AEGM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/gm_handler.go | 1 +
 src/server/game/player_mod.go | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go
index 1818b0d6..dd0f622e 100644
--- a/src/server/game/gm_handler.go
+++ b/src/server/game/gm_handler.go
@@ -561,6 +561,7 @@ func ReqGmCommand_(player *Player, Command string) error {
 		}
 		log.Debug("player reset: old account: %s; new account %s", account, newAccount)
 		BaseMod.Account = newAccount
+		player.GetPlayerBaseMod().Data.UserName = newAccount
 		player.PushAndSendClienRes(&msg.ForceKickOut{})
 	case "resetCode":
 		BaseMod := player.PlayMod.getBaseMod()
diff --git a/src/server/game/player_mod.go b/src/server/game/player_mod.go
index 543b09e6..ad73eff0 100644
--- a/src/server/game/player_mod.go
+++ b/src/server/game/player_mod.go
@@ -170,10 +170,9 @@ func (p *PlayerModData) InitMod(player *Player) (bool, error) {
 		is_update = true
 	}
 	BaseMod := &p.ModList.Base
+	PlayerBaseMod := player.GetPlayerBaseMod()
 	if BaseMod.Uid == 0 {
-		PlayerBaseMod := player.GetPlayerBaseMod()
 		BaseMod.Uid = PlayerBaseMod.Data.DwUin
-		BaseMod.SetAccount(PlayerBaseMod.Data.UserName)
 		BaseMod.SetLevel(1)
 		BaseMod.SetExp(0)
 		BaseMod.SetEnergy(userCfg.GetInitEnergy())
@@ -183,6 +182,7 @@ func (p *PlayerModData) InitMod(player *Player) (bool, error) {
 		BaseMod.FackBookId = PlayerBaseMod.Data.FaceBookId
 		is_update = true
 	}
+	BaseMod.SetAccount(PlayerBaseMod.Data.UserName)
 	Ip := p.GetPlayer().GetIp()
 	p.ModList.Handbook.InitData()
 	p.ModList.Order.InitData()