From 9a434d55d76c3fcb85c63c172a0445da42d8033c Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Mon, 10 Nov 2025 01:53:28 +0000
Subject: [PATCH] =?UTF-8?q?fix(fight):=20=E7=99=BB=E5=BD=95=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=96=AD=E5=BC=80=EF=BC=8C=E6=88=98=E6=96=97=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/controller/login.go     | 1 +
 logic/service/fight/fightc.go | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/logic/controller/login.go b/logic/controller/login.go
index 2b01933e..f39cf630 100644
--- a/logic/controller/login.go
+++ b/logic/controller/login.go
@@ -38,6 +38,7 @@ func (h *Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.
 	tt := data.CheakSession()
 	if !tt {
 		err = errorcode.ErrorCodes.ErrLoginServerError
+		defer c.Close()
 		return
 	}
 
diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go
index 4a6e9ffd..8a7872c8 100644
--- a/logic/service/fight/fightc.go
+++ b/logic/service/fight/fightc.go
@@ -343,6 +343,9 @@ func IsNil(x interface{}) bool {
 	return rv.Kind() == reflect.Ptr && rv.IsNil()
 }
 func (f *FightC) copyskill(t *action.SelectSkillAction) *info.SkillEntity {
+	if t == nil {
+		return nil
+	}
 	if t.SkillEntity == nil {
 		return nil