diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index 40d83e09..55584f52 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -134,6 +134,7 @@ func ReqGmCommand_(player *Player, Command string) error { case "setSevenLoginActive": num, _ := strconv.Atoi(arg[1]) player.PlayMod.getSevenLoginMod().Active = num + player.PushClientRes(player.PlayMod.getSevenLoginMod().BackData()) case "pay": ChargeId, _ := strconv.Atoi(arg[1]) player.TeLog("pay", map[string]interface{}{ diff --git a/src/server/game/mail_mgr.go b/src/server/game/mail_mgr.go index b233ce23..65feb1ef 100644 --- a/src/server/game/mail_mgr.go +++ b/src/server/game/mail_mgr.go @@ -57,7 +57,11 @@ func (m *MailMgr) Init() { } func (m *MailMgr) AddMail(msg *msg.Msg) (interface{}, error) { - ServerMail := msg.Extra.(*ServerMail) + ServerMail, ok := msg.Extra.(*ServerMail) + if !ok { + log.Error("AddMail error: invalid mail data") + return nil, nil + } m.list[ServerMail.Id] = ServerMail return nil, nil } diff --git a/src/server/test/fix_test.go b/src/server/test/fix_test.go index d2741964..c8a92a41 100644 --- a/src/server/test/fix_test.go +++ b/src/server/test/fix_test.go @@ -92,7 +92,8 @@ func TestFixUserData(t *testing.T) { func TestRandInt(t *testing.T) { p1 := new(game.Player) p1.InitPlayer("3625212") - p1.Charge(122) + SevenMod := p1.GetSevenLoginMod() + SevenMod.BackData() } func TestEndless(t *testing.T) {