From 313a705b94655ef8748cdafff4d46ff8c5cfa44f Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Mon, 10 Apr 2023 17:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A6=E9=A6=86=E9=A9=B1?=
 =?UTF-8?q?=E9=80=90=20=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/practice/api_expulsion.go | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/modules/practice/api_expulsion.go b/modules/practice/api_expulsion.go
index 8f0101dff..be7abcf26 100644
--- a/modules/practice/api_expulsion.go
+++ b/modules/practice/api_expulsion.go
@@ -177,29 +177,20 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
 			}
 		}
 	}
-	defer func() {
-		if ok { //在线直接推送消息
-			this.module.PutUserSession(_session)
-		}
-	}()
 	_session, ok = this.module.GetUserSession(pillar.Uid)
-	// if _session, ok = this.module.GetUserSession(pillar.Uid); ok {
-	// 	if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success {
-	// 		return
-	// 	}
-	// 	if code = this.module.DispenseRes(_session, append(ants1, ants2...), true); code != pb.ErrorCode_Success {
-	// 		return
-	// 	}
-	// 	if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success {
-	// 		return
-	// 	}
-	// } else {
 	if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success {
 		return
 	}
 	if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success {
 		return
 	}
+	if ok { //在线直接推送消息
+		if err = _session.Push(); err != nil {
+			this.module.Errorln(err)
+		}
+		this.module.PutUserSession(_session)
+	}
+
 	res := make([]*pb.UserAssets, 0)
 	for _, v := range ants1 {
 		res = append(res, &pb.UserAssets{