From cd5203b8f69b711cc02246b47328d686d35b7983 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 17 Feb 2025 12:05:52 +0800
Subject: [PATCH] playroom bug

---
 src/server/game/Gm.go         | 4 ++++
 src/server/game/PlayerFunc.go | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go
index 87cdf715..8b52f10c 100644
--- a/src/server/game/Gm.go
+++ b/src/server/game/Gm.go
@@ -11,6 +11,7 @@ import (
 	playroomCfg "server/conf/playroom"
 	"server/db"
 	"server/game/mod/card"
+	"server/game/mod/friend"
 	"server/game/mod/item"
 	MsgMod "server/game/mod/msg"
 	"server/game/mod/playroom"
@@ -256,6 +257,9 @@ func ReqGmCommand_(player *Player, Command string) error {
 	case "resetTriggerTime":
 		PlayroomMod := player.PlayMod.getPlayroomMod()
 		PlayroomMod.TriggerTime = 0
+	case "resetTimeline":
+		FriendMod := player.PlayMod.getFriendMod()
+		FriendMod.Log = make([]*friend.LogInfo, 0)
 	case "recoverUser":
 		file, err := os.OpenFile(conf.Server.GameConfPath+"user.info", os.O_RDWR|os.O_CREATE, 0666)
 		if err != nil {
diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go
index 582b689f..4055e7e5 100644
--- a/src/server/game/PlayerFunc.go
+++ b/src/server/game/PlayerFunc.go
@@ -302,13 +302,16 @@ func SyncFriendMsg(p *Player) {
 	})
 	maxId := int64(0)
 	for _, v := range ml {
-		if v.Id <= MsgId {
+		maxId = max(maxId, v.Id)
+		if v.H == 1 {
+			continue
+		}
+		if v.Id > 0 && v.Id <= MsgId {
 			continue
 		}
-		maxId = max(maxId, v.Id)
 		handle(p, v)
 	}
-	FriendMod.SetSyncId(int64(maxId))
+	FriendMod.SetSyncId(maxId)
 	p.PlayMod.save()
 }