diff --git a/ClickMorph.lua b/ClickMorph.lua index 976ceda..48f811a 100644 --- a/ClickMorph.lua +++ b/ClickMorph.lua @@ -297,7 +297,8 @@ end function CM:MorphItem(unit, item, silent) local morph = CM:CanMorph() - if item and morph and morph.item then + -- nobody wants to morph while looting and it would interfere with dkp addons + if item and morph and morph.item and not LootFrame:IsShown() then local itemID, itemLink, equipLoc = CM:GetItemInfo(item) local slotID = InvTypeToSlot[equipLoc] if slotID then @@ -310,7 +311,9 @@ function CM:MorphItem(unit, item, silent) end end -hooksecurefunc("HandleModifiedItemClick", CM.MorphItem) +hooksecurefunc("HandleModifiedItemClick", function(item) + CM:MorphItem("player", item) +end) function CM:MorphItemBySource(unit, source, silent) local morph = self:CanMorph() diff --git a/Inspect.lua b/Inspect.lua index 4909309..9f5c135 100644 --- a/Inspect.lua +++ b/Inspect.lua @@ -80,8 +80,8 @@ function f:InitializeInspect() end end local class = UnitClassBase(unit) - local fullName = GetUnitName(unit, true) local hex = select(4, GetClassColor(class)) + local fullName = GetUnitName(unit, true) local unitLink = "|c"..TEXT_MODE_A_STRING_DEST_UNIT:format(hex, UnitGUID(unit), fullName, fullName) CM:PrintChat(format("items -> %s", unitLink)) end diff --git a/VERSION b/VERSION index ce6a70b..2eda823 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.0 \ No newline at end of file +1.6.1 \ No newline at end of file