From 81552f2effbdf70320daa685d61b134b63a7bfd4 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 14 Feb 2023 18:37:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0pvp=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/pvp/api_into.go | 2 +- modules/pvp/module.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/pvp/api_into.go b/modules/pvp/api_into.go index a81c57f5e..7a2e853b6 100644 --- a/modules/pvp/api_into.go +++ b/modules/pvp/api_into.go @@ -36,7 +36,7 @@ func (this *apiComp) Into(session comm.IUserSession, req *pb.PvpIntoReq) (code p battle.RedSession.SetSession(session.GetIP(), session.GetSessionId(), session.GetServiecTag(), session.GetGatewayServiceId(), session.GetUserId()) } else { battle.BlueOffline = false - battle.RedSession.SetSession(session.GetIP(), session.GetSessionId(), session.GetServiecTag(), session.GetGatewayServiceId(), session.GetUserId()) + battle.BlueSession.SetSession(session.GetIP(), session.GetSessionId(), session.GetServiecTag(), session.GetGatewayServiceId(), session.GetUserId()) } battle.lock.Unlock() } diff --git a/modules/pvp/module.go b/modules/pvp/module.go index 7356e1274..2f6659f57 100644 --- a/modules/pvp/module.go +++ b/modules/pvp/module.go @@ -389,7 +389,9 @@ func (this *Pvp) useroffline(session comm.IUserSession) { } if v.curroperate.Side == side { - timewheel.Remove(v.operatetimer) + if v.operatetimer != nil { + timewheel.Remove(v.operatetimer) + } v.curroperate.Auto = true data, _ = proto.Marshal(v.curroperate) if code = this.battle.InCmdBattle(&pb.BattleInCmdReq{