From c734417b1cfc1d14c1c872e05332b6972bd26d6a Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 7 Jan 2026 11:49:45 +0800
Subject: [PATCH] =?UTF-8?q?catnip=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/register_network_func.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go
index 26dee3cc..6e88dfba 100644
--- a/src/server/game/register_network_func.go
+++ b/src/server/game/register_network_func.go
@@ -5779,6 +5779,9 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error {
 		case friend.REPLY_TYPE_CATNIP: // 猫草大作战同意邀请
 			GameId := GoUtil.Int(ReplyInfo.Param)
 			activityInfo := player.GetActivityInfo(player.GetActivityId(activity.ACT_TYPE_CATNIP))
+			if activityInfo == nil {
+				break
+			}
 			err := player.SetCatnipPartner(GameId, ReplyInfo.Uid, activityInfo.EndT)
 			if err == nil {
 				CatnipMod := player.PlayMod.getCatnipMod()