From 99ade15810defcbc27f85e95fc7ddabbada3039b Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 2 Apr 2026 17:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E6=89=93=E6=8B=9B=E5=91=BC?=
 =?UTF-8?q?=E5=A5=96=E5=8A=B1bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/req_func_friend.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/server/game/req_func_friend.go b/src/server/game/req_func_friend.go
index 2a3a4e04..7a7e7ece 100644
--- a/src/server/game/req_func_friend.go
+++ b/src/server/game/req_func_friend.go
@@ -8,6 +8,7 @@ import (
 	"server/db"
 	"server/game/mod/activity"
 	"server/game/mod/friend"
+	"server/game/mod/item"
 	MsqMod "server/game/mod/msg"
 	GoUtil "server/game_util"
 	"server/msg"
@@ -417,6 +418,7 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error {
 	}
 	ErrType := msg.FRIEND_REPLY_HANDLE_ERR_TYPE_NONE
 	now := GoUtil.Now()
+	items := make([]*item.Item, 0)
 	if req.Type == 1 && ReplyInfo.Uid > 10000 {
 		switch ReplyInfo.Type {
 		case friend.REPLY_TYPE_GREETING:
@@ -434,6 +436,8 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error {
 				Extra: ReplyData,
 			})
 			FriendMod.GreetingFriend(int(ReplyInfo.Uid))
+			reply_items := baseCfg.GetFriendReplyReward()
+			items = append(items, reply_items...)
 		case friend.REPLY_TYPE_CATNIP: // 猫草大作战同意邀请
 			GameId := GoUtil.Int(ReplyInfo.Param)
 			activityInfo := player.GetActivityInfo(player.GetActivityId(activity.ACT_TYPE_CATNIP))
@@ -480,14 +484,15 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error {
 
 		}
 	}
-	Items := baseCfg.GetFriendReplyReward()
-	err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendReplyHandle.String())
-	if err != nil {
-		player.SendErrClienRes(&msg.ResFriendReplyHandle{
-			Code: msg.RES_CODE_FAIL,
-			Msg:  err.Error(),
-		})
-		return err
+	if len(items) > 0 {
+		err = player.HandleItem(items, msg.ITEM_POP_LABEL_FriendReplyHandle.String())
+		if err != nil {
+			player.SendErrClienRes(&msg.ResFriendReplyHandle{
+				Code: msg.RES_CODE_FAIL,
+				Msg:  err.Error(),
+			})
+			return err
+		}
 	}
 	player.FriendLogBackData()
 	player.PushClientRes(&msg.ResFriendReplyHandle{