From d79f947b7df30d8019fb42f08198c0ee915300ac Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 12 Mar 2024 17:49:51 +0800
Subject: [PATCH] 1

---
 server/matchserver/common/types.go     | 5 +----
 server/matchserver/player/player.go    | 5 +++++
 server/matchserver/player/playermgr.go | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/matchserver/common/types.go b/server/matchserver/common/types.go
index 2b700b06..046d606c 100644
--- a/server/matchserver/common/types.go
+++ b/server/matchserver/common/types.go
@@ -47,6 +47,7 @@ type TeamMgr interface {
 	ProcessCMMsg(*cs.CsNetMsgHandler, *f5.MsgHdr)
 	CreateTeam(Player, *cs.CMLogin) Team
 	GetTeamByUuid(string) Team
+	RefreshHisTeam(Player)
 }
 
 type Player interface {
@@ -66,10 +67,6 @@ type PlayerMgr interface {
 	ProcessCMMsg(*cs.CsNetMsgHandler, *f5.MsgHdr)
 	GetPlayerBySocket(f5.WspCliConn) Player
 	GetPlayerByAccountId(string) Player
-	HasHisPendingTeam(Player) bool
-	TraverseHisPendingTeam(Player)
-	HasHisStartedTeam(Player) bool
-	TraverseHisStartedTeam(Player)
 }
 
 type WspListener interface {
diff --git a/server/matchserver/player/player.go b/server/matchserver/player/player.go
index 6e564b3a..20483f03 100644
--- a/server/matchserver/player/player.go
+++ b/server/matchserver/player/player.go
@@ -174,3 +174,8 @@ func (this *player) CMSetReady(hdr *f5.MsgHdr, msg *cs.CMSetReady) {
 
 func (this *player) CMGrantInvitePermission(hdr *f5.MsgHdr, msg *cs.CMGrantInvitePermission) {
 }
+
+func newPlayer() *player {
+	hum := new(player)
+	return hum
+}
diff --git a/server/matchserver/player/playermgr.go b/server/matchserver/player/playermgr.go
index 78b16138..83f4a4b6 100644
--- a/server/matchserver/player/playermgr.go
+++ b/server/matchserver/player/playermgr.go
@@ -158,7 +158,7 @@ func (this *playerMgr) apiAuthCb(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.HttpCli
 	}
 
 	if msg.GetCreateTeamParam() != nil {
-		hum := new(player)
+		hum := newPlayer()
 		hum.init(pendingReq, &rspObj)
 		this.socketHash[pendingReq.hdr.GetSocket()] = hum
 		team := GetTeamMgr().CreateTeam(hum, msg)
@@ -196,7 +196,7 @@ func (this *playerMgr) apiAuthCb(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.HttpCli
 			hum.againInit(pendingReq, &rspObj)
 			this.socketHash[pendingReq.hdr.GetSocket()] = hum
 		} else {
-			hum := new(player)
+			hum := newPlayer()
 			hum.init(pendingReq, &rspObj)
 			this.socketHash[pendingReq.hdr.GetSocket()] = hum
 			team.Join(hum)