lib: update cargBags, support legion keystone

fafaraway · Dec 12, 2021 · 1488c15 · 1488c15
1 parent 2df3bc6
commit 1488c15
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/libs/cargBags/base/implementation.lua b/libs/cargBags/base/implementation.lua
@@ -33,7 +33,10 @@ local toBagSlot = cargBags.ToBagSlot
 local LE_ITEM_CLASS_MISCELLANEOUS = Enum.ItemClass.Miscellaneous or 15
 local LE_ITEM_MISCELLANEOUS_COMPANION_PET = Enum.ItemMiscellaneousSubclass.CompanionPet or 2
 local PET_CAGE = 82800
-local MYTHIC_KEYSTONE = 180653
+local MYTHIC_KEYSTONES = {
+	[180653] = true,
+	[187786] = true, -- Timewarped
+}
 
 --[[!
 	Creates a new instance of the class
@@ -322,7 +325,7 @@ function Implementation:GetItemInfo(bagID, slotID, i)
 			i.level = tonumber(petLevel) or 0
 			i.classID = LE_ITEM_CLASS_MISCELLANEOUS
 			i.subClassID = LE_ITEM_MISCELLANEOUS_COMPANION_PET
-		elseif itemID == MYTHIC_KEYSTONE then
+		elseif MYTHIC_KEYSTONES[itemID] then
 			i.level, i.name = strmatch(itemLink, "|H%w+:%d+:%d+:(%d+):.-|h%[(.-)%]|h")
 			i.level = tonumber(i.level) or 0
 		end

diff --git a/libs/cargBags/mixins-add/plugins/bagBar.lua b/libs/cargBags/mixins-add/plugins/bagBar.lua
@@ -141,6 +141,8 @@ function BagButton:OnLeave()
 end
 
 function BagButton:OnClick(btn)
+	if InCombatLockdown() then UIErrorsFrame:AddMessage("|cff99ccff"..ERR_NOT_IN_COMBAT) return end -- PutItemInBag is secure in combat
+
 	if(self.notBought) then
 		BankFrame.nextSlotCost = GetBankSlotCost(GetNumBankSlots())
 		return StaticPopup_Show("CONFIRM_BUY_BANK_SLOT")
@@ -230,4 +232,4 @@ cargBags:RegisterPlugin("BagBar", function(self, bags)
 	self.implementation:RegisterEvent("ITEM_LOCK_CHANGED", bar, onLock)
 
 	return bar
-end)
+end)