Merge remote-tracking branch 'fork/master'

classes/container_actors.lua

@@ -408,7 +408,7 @@ end
 				return playerName
 			end
 
-			if (not UnitIsInMyGuild(playerName)) then
+			if (not UnitIsInMyGuild(playerName) and playerName ~= Details.playername) then
 				return playerName
 			end
 		else
@@ -429,10 +429,10 @@ end
 			if (bitBand(actorFlags, OBJECT_TYPE_PLAYER) ~= 0) then
 				if (not Details.ignore_nicktag) then
 					local actorNameAmbiguated = Ambiguate(actorName, "none")
-					actorObject.displayName = checkValidNickname(Details:GetNickname(actorNameAmbiguated, false, true), actorName) --defaults to player name
-					if (Details.remove_realm_from_name) then
-						actorObject.displayName = actorObject.displayName:gsub(("%-.*"), "")
-					end
+                    local nickname = Details:GetNickname(actorNameAmbiguated, false, true)
+                    if nickname then
+					    actorObject.displayName = checkValidNickname(nickname, actorName) --defaults to player name
+                    end
 				end
 
 				if (not actorObject.displayName) then