- escaping ',' in npc names for sending.

Tercioo · Apr 23, 2024 · cfee1e1 · cfee1e1
1 parent 2a1dd5c
commit cfee1e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Plater_ChangeLog.lua b/Plater_ChangeLog.lua
@@ -8,6 +8,7 @@ function Plater.GetChangelogTable()
 	if (not Plater.ChangeLogTable) then
 		Plater.ChangeLogTable = {
 
+			{1713856200, "Bug Fix", "April 23rd, 2024", "Sending NPC information to other players would not work if the name contained a ','.", "cont1nuity"},
 			{1713856200, "Bug Fix", "April 23rd, 2024", "Fixing options alignment issue with Cata.", "cont1nuity"},
 			{1713856200, "Backend Change", "April 22nd, 2024", "Base support for TWW.", "cont1nuity"},
 			{1713856200, "Backend Change", "April 19nd, 2024", "Backend changes to options layout.", "Terciob"},

diff --git a/Plater_Comms.lua b/Plater_Comms.lua
@@ -365,6 +365,9 @@ end
 				local npcName = nextDataToApprove[3]
 				local npcZone = nextDataToApprove[4]
 				local senderName = nextDataToApprove[6]
+
+				npcName = string.gsub(npcName, "@C@", ","))
+				npcZone = string.gsub(npcZone, "@C@", ","))
 
 				frame.Text1:SetText("From: " .. senderName)
 
@@ -381,6 +384,8 @@ end
 
 				elseif (whichInfo == "npcrename") then
 					local newName = nextDataToApprove[5]
+					newName = string.gsub(newName, "@C@", ","))
+
 					frame.Text2:SetText("Rename: |cFFFFDD00" .. npcName .. "|r to: |cFFFFDD00" .. newName)
 
 					frame.AcceptButton:SetClickFunction(function()
@@ -802,6 +807,9 @@ end
 			Plater:Msg("npcInfo not found.")
 			return
 		end
+
+		npcName = string.gsub(npcName, ",", "@C@"))
+		npcZone = string.gsub(npcZone, ",", "@C@"))
 
 		local dataToSend
 
@@ -822,6 +830,8 @@ end
 				Plater:Msg("npc does not have a custom name.")
 				return
 			end
+
+			npcNameRenamed = string.gsub(npcNameRenamed, ",", "@C@"))
 
 			dataToSend = whichInfo .. "," .. npcId .. "," .. npcName .. "," .. npcZone .. "," .. (autoAccept and "1" or "0") .. "," .. npcNameRenamed