Improve Friends Notifications (#4194)

* Improve Friends Notifications Friends will now send broadcast text to announce their online status as was the case in retail. * Update Player_Networking.cs :} * Update Player_Networking.cs
ACEmulator · Jun 6, 2024 · 2c459c7 · 2c459c7
1 parent 575688c
commit 2c459c7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/Source/ACE.Server/Managers/PlayerManager.cs b/Source/ACE.Server/Managers/PlayerManager.cs
@@ -392,7 +392,7 @@ public static bool SwitchPlayerFromOfflineToOnline(Player player)
 
             AllegianceManager.LoadPlayer(player);
 
-            player.SendFriendStatusUpdates();
+            player.SendFriendStatusUpdates(false, !player.GetAppearOffline());
 
             return true;
         }
@@ -426,7 +426,7 @@ public static bool SwitchPlayerFromOnlineToOffline(Player player)
                 playersLock.ExitWriteLock();
             }
 
-            player.SendFriendStatusUpdates(false);
+            player.SendFriendStatusUpdates(!player.GetAppearOffline(), false);
             player.HandleAllegianceOnLogout();
 
             return true;

diff --git a/Source/ACE.Server/WorldObjects/Player_Character.cs b/Source/ACE.Server/WorldObjects/Player_Character.cs
@@ -220,8 +220,9 @@ public bool GetAppearOffline()
         /// </summary>
         public void SetAppearOffline(bool appearOffline)
         {
+            var previousAppearOffline = GetAppearOffline();
             SetCharacterOption(CharacterOption.AppearOffline, appearOffline);
-            SendFriendStatusUpdates();
+            SendFriendStatusUpdates(!previousAppearOffline, !GetAppearOffline());
         }
 
 

diff --git a/Source/ACE.Server/WorldObjects/Player_Networking.cs b/Source/ACE.Server/WorldObjects/Player_Networking.cs
@@ -259,7 +259,7 @@ public void SendInventoryAndWieldedItems()
             foreach (var item in EquippedObjects.Values)
             {
                 item.Wielder = this;
-                Session.Network.EnqueueSend(new GameMessageCreateObject(item));                
+                Session.Network.EnqueueSend(new GameMessageCreateObject(item));
             }
         }
 
@@ -272,28 +272,25 @@ public void SendContractTrackerTable()
         /// <summary>
         /// Will send out GameEventFriendsListUpdate packets to everyone online that has this player as a friend.
         /// </summary>
-        public void SendFriendStatusUpdates()
+        public void SendFriendStatusUpdates(bool previouslyOnline, bool isOnline)
         {
-            var inverseFriends = PlayerManager.GetOnlineInverseFriends(Guid);
+            var appearOffline = GetAppearOffline();
+            var previouslyOnlineAndIsNowOffline = previouslyOnline && !isOnline;
+            var previouslyOfflineAndIsNowOnline = !previouslyOnline && isOnline;
+            var previouslyOfflineAndAppearOffline = !previouslyOnline && appearOffline;
 
-            foreach (var friend in inverseFriends)
+            if ((previouslyOfflineAndIsNowOnline && !previouslyOfflineAndAppearOffline) || previouslyOnlineAndIsNowOffline)
             {
-                var playerFriend = new CharacterPropertiesFriendList { CharacterId = friend.Guid.Full, FriendId = Guid.Full };
-                friend.Session.Network.EnqueueSend(new GameEventFriendsListUpdate(friend.Session, GameEventFriendsListUpdate.FriendsUpdateTypeFlag.FriendStatusChanged, playerFriend, true, !GetAppearOffline()));
-            }
-        }
+                var msg = $"{Name} has {(isOnline ? "come on" : "gone off")}line.";
 
-        /// <summary>
-        /// Will send out GameEventFriendsListUpdate packets to everyone online that has this player as a friend.
-        /// </summary>
-        public void SendFriendStatusUpdates(bool onlineStatus)
-        {
-            var inverseFriends = PlayerManager.GetOnlineInverseFriends(Guid);
+                var inverseFriends = PlayerManager.GetOnlineInverseFriends(Guid);
 
-            foreach (var friend in inverseFriends)
-            {
-                var playerFriend = new CharacterPropertiesFriendList { CharacterId = friend.Guid.Full, FriendId = Guid.Full };
-                friend.Session.Network.EnqueueSend(new GameEventFriendsListUpdate(friend.Session, GameEventFriendsListUpdate.FriendsUpdateTypeFlag.FriendStatusChanged, playerFriend, true, onlineStatus));
+                foreach (var friend in inverseFriends)
+                {
+                    var playerFriend = new CharacterPropertiesFriendList { CharacterId = friend.Guid.Full, FriendId = Guid.Full };
+                    friend.Session.Network.EnqueueSend(new GameEventFriendsListUpdate(friend.Session, GameEventFriendsListUpdate.FriendsUpdateTypeFlag.FriendStatusChanged, playerFriend, true, isOnline));
+                    friend.SendMessage(msg);
+                }
             }
         }