Merge branch 'master' into valyndor

Author: ccrs

sql/updates/world/3.3.5/2026_08_06_00_world.sql

@@ -0,0 +1,6 @@
+--
+UPDATE `smart_scripts` SET `event_type` = 1, `event_param1` = 4000, `event_param2` = 5000, `event_param3` = 4000, `event_param4` = 5000, `comment` = "Surveyor Candress - Out of Combat - Cast 'Red Beam'" WHERE `entryorguid` = 16522 AND `source_type` = 0 AND `id` = 0;
+
+DELETE FROM `disables` WHERE `sourceType` = 0 AND `entry` = 31515; 
+INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES
+(0,31515,64,'','',"Disable LOS for spell 'Red Beam'");

src/server/game/Entities/Item/Item.cpp

@@ -1151,7 +1151,7 @@ uint32 Item::GetSellPrice(bool forVendor /*= false*/) const
 {
     ItemTemplate const* itemTemplate = GetTemplate();
     int32 price = Item::GetSellPrice(itemTemplate);
-    if (forVendor)
+    if (price && forVendor)
     {
         auto effectWithCharges = std::ranges::find_if(itemTemplate->Effects,
             [](ItemEffect const& itemEffect) { return itemEffect.SpellID && itemEffect.TriggerType == ITEM_SPELLTRIGGER_ON_USE && itemEffect.Charges < 0; });

src/server/game/Spells/Spell.cpp

@@ -5176,7 +5176,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint
 
         if (m_caster->ToUnit() && !m_caster->ToUnit()->GetSpellHistory()->IsReady(m_spellInfo, m_castItemEntry, IsIgnoringCooldowns()))
         {
-            if (m_triggeredByAuraSpell || (m_spellInfo->IsCooldownStartedOnEvent() && !m_caster->ToUnit()->GetSpellHistory()->HasOnHoldCooldown(m_spellInfo->Id)))
+            if (m_triggeredByAuraSpell || (m_spellInfo->IsCooldownStartedOnEvent() && !m_caster->ToUnit()->GetSpellHistory()->HasCooldownOnHold(m_spellInfo->Id)))
                 return SPELL_FAILED_DONT_REPORT;
 
             return SPELL_FAILED_NOT_READY;

src/server/game/Spells/SpellHistory.cpp

@@ -483,8 +483,9 @@ bool SpellHistory::HasCooldown(uint32 spellId, uint32 itemId /*= 0*/, bool ignor
     return HasCooldown(sSpellMgr->AssertSpellInfo(spellId), itemId, ignoreCategoryCooldown);
 }
 
-bool SpellHistory::HasOnHoldCooldown(uint32 spellId) const
+bool SpellHistory::HasCooldownOnHold(uint32 spellId) const
 {
+    // TODO: Delete this function and make SpellHistory::IsReady return enum with reason instead of bool
     auto itr = _spellCooldowns.find(spellId);
     return itr != _spellCooldowns.end() && itr->second.OnHold;
 }

src/server/game/Spells/SpellHistory.h

@@ -122,7 +122,7 @@ class TC_GAME_API SpellHistory
     void ResetAllCooldowns();
     bool HasCooldown(SpellInfo const* spellInfo, uint32 itemId = 0, bool ignoreCategoryCooldown = false) const;
     bool HasCooldown(uint32 spellId, uint32 itemId = 0, bool ignoreCategoryCooldown = false) const;
-    bool HasOnHoldCooldown(uint32 spellId) const;
+    bool HasCooldownOnHold(uint32 spellId) const;
     uint32 GetRemainingCooldown(SpellInfo const* spellInfo) const;
 
     // School lockouts