From c08633aa46d18dad87142abd1f6aadc5a8dbb550 Mon Sep 17 00:00:00 2001
From: KingRainbow44 <kobedo11@gmail.com>
Date: Fri, 14 Apr 2023 02:37:15 -0400
Subject: [PATCH] Fix issue with trial teams

---
 .../packet/send/PacketAvatarTeamUpdateNotify.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java
index 7f817e6b8..4a6263b48 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java
@@ -12,10 +12,14 @@ public class PacketAvatarTeamUpdateNotify extends BasePacket {
 
         AvatarTeamUpdateNotify.Builder proto = AvatarTeamUpdateNotify.newBuilder();
 
-        player
-                .getTeamManager()
-                .getTeams()
-                .forEach((id, teamInfo) -> proto.putAvatarTeamMap(id, teamInfo.toProto(player)));
+        var teamManager = player.getTeamManager();
+        if (teamManager.isUsingTrialTeam()) {
+            proto.addAllTempAvatarGuidList(teamManager.getActiveTeam().stream()
+                .map(entity -> entity.getAvatar().getGuid()).toList());
+        } else {
+            teamManager.getTeams().forEach((key, value) ->
+                proto.putAvatarTeamMap(key, value.toProto(player)));
+        }
 
         this.setData(proto);
     }