diff --git a/server/matchserver/team/matchmgr.go b/server/matchserver/team/matchmgr.go index 69f53d09..ff41d590 100644 --- a/server/matchserver/team/matchmgr.go +++ b/server/matchserver/team/matchmgr.go @@ -2,8 +2,8 @@ package team import ( "q5" - /*"f5" - "cs" + "f5" + /*"cs" "main/common" "mt"*/ ) @@ -12,6 +12,7 @@ type matchingInfo struct { team *team addTick int64 entry q5.ListHead + matchTimerWp *f5.TimerWp matchOk* matchingInfo } @@ -48,6 +49,9 @@ func (this *matchMgr) cancelMatch(team *team) bool { panic("cancelMatching error") return false } + if !m.matchTimerWp.Expired() { + f5.GetTimer().Delete(m.matchTimerWp) + } m.entry.DelInit() delete(this.teamUuidHash, team.GetTeamUuid()) }