From dc23b482f6129c48a5ebbe6dfd7b38dd96d7f51c Mon Sep 17 00:00:00 2001
From: darbdarb <bradcooper99@gmail.com>
Date: Thu, 17 Aug 2023 21:14:13 +1000
Subject: [PATCH] Fixed leave messages in floofchat

---
 scripts/communityScripts/chat/FloofChat.js | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/scripts/communityScripts/chat/FloofChat.js b/scripts/communityScripts/chat/FloofChat.js
index 26ab0d04e7..3e786d9827 100644
--- a/scripts/communityScripts/chat/FloofChat.js
+++ b/scripts/communityScripts/chat/FloofChat.js
@@ -643,31 +643,39 @@ function setVisible(_visible) {
     visible = _visible;
 }
 
+var palDataStore = AvatarManager.getPalData().data;
+
 function avatarJoinsDomain(sessionID) {
     Script.setTimeout(function () {
-        var messageText = AvatarManager.getPalData([sessionID]).data[0].sessionDisplayName + " has joined."
+        palDataStore = AvatarManager.getPalData().data;
+        var DisplayName = AvatarManager.getPalData([sessionID]).data[0].sessionDisplayName;
+        var messageText = DisplayName + " has joined.";
         var messageColor = { red: 122, green: 122, blue: 122 };
-        
         addToLog(messageText, "Notice", messageColor, "Domain");
-        
+
         if (!mutedAudio["Domain"]) {
             playNotificationSound();
         }
-        
+
         if (!muted["Domain"]) {
             Messages.sendLocalMessage(FLOOF_NOTIFICATION_CHANNEL, JSON.stringify({
                 sender: "(D)",
-                text:  messageText,
+                text: messageText,
                 colour: { text: messageColor }
             }));
         }
-    }, 500); // Wait 500ms for the avatar to load to properly get info about them.
-}
 
+    }, 1500); // Wait 1500ms for the avatar to load to properly get info about them.
+}
 function avatarLeavesDomain(sessionID) {
-    var messageText = AvatarManager.getPalData([sessionID]).data[0].sessionDisplayName + " has left."
+    var displayName = "";
+    for (let i = 0; i < palDataStore.length; i++) {
+        if (palDataStore[i].sessionUUID == sessionID) {
+            displayName = palDataStore[i].sessionDisplayName;
+        }
+    }
+    var messageText = displayName + " has left.";
     var messageColor = { red: 122, green: 122, blue: 122 };
-    
     addToLog(messageText, "Notice", messageColor, "Domain");
     
     if (!mutedAudio["Domain"]) {