From dd3a4edb98c977f425c7b4640af0ababd21e59ce Mon Sep 17 00:00:00 2001 From: Flamanis Date: Sun, 23 Jun 2024 15:43:19 -0500 Subject: [PATCH] init --- classes/container_actors.lua | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/classes/container_actors.lua b/classes/container_actors.lua index 2ebc89dd..7f893f18 100644 --- a/classes/container_actors.lua +++ b/classes/container_actors.lua @@ -401,21 +401,21 @@ end nickname = nickname:trim() if (nickname == "" or nickname:len() < 2) then - return playerName + return false end if (nickname:len() > 20) then - return playerName + return false end if (not UnitIsInMyGuild(playerName) and playerName ~= Details.playername) then - return playerName + return false end else - return playerName + return false end - return nickname + return true end local dungeonFollowersNpcs = {} @@ -427,14 +427,16 @@ end --if the actor is a player if (bitBand(actorFlags, OBJECT_TYPE_PLAYER) ~= 0) then - --display name - if (not Details.ignore_nicktag) then - local actorNameAmbiguated = Ambiguate(actorName, "none") - local nickname = Details:GetNickname(actorNameAmbiguated, false, true) - if nickname then - actorObject.displayName = checkValidNickname(nickname, actorName) --defaults to player name - end - end + + if (not Details.ignore_nicktag) then + local actorNameAmbiguated = Ambiguate(actorName, "none") + local nickname = Details:GetNickname(actorNameAmbiguated, false, true) + if nickname then + if checkValidNickname(nickname, actorName) then + actorObject.displayName = nickname --defaults to player name + end + end + end --the actor does not have a nickname, use the character name instead if (not actorObject.displayName) then