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{