Minor refact

Author: Traesh

src/server/game/Craft/Crafting.cpp

@@ -27,16 +27,13 @@
 #include "SpellPackets.h"
 #include "Player.h"
 
-void Crafting::DoCraft(uint32 craftingDataId)
+SpellCastResult Crafting::DoCraft(uint32 craftingDataId)
 {
     std::vector<ModifiedCraftingSpellSlotEntry const*> spellSlots = sDB2Manager.GetMCRSpellSlotBySpell(_spell->GetSpellInfo()->Id);
     _craftingData = sCraftingDataStore.LookupEntry(craftingDataId);
 
     if (!_craftingData || spellSlots.empty())
-    {
-        _spell->SendCastResult(SpellCastResult::SPELL_FAILED_ERROR);
-        return;
-    }
+        return SpellCastResult::SPELL_FAILED_ERROR;
 
     std::unordered_map<uint32 /*itemId*/, uint32 /*quantity*/> usedReagentsToDestroy;
     std::vector<uint32> bonusTreeIds;
@@ -76,10 +73,7 @@ void Crafting::DoCraft(uint32 craftingDataId)
         {
             // If we don't have enough Reagent for this slot and it is required, craft failed
             if (reagentSlot->ReagentType == MCR_REAGENT_TYPE_REQUIRED)
-            {
-                _spell->SendCastResult(SpellCastResult::SPELL_FAILED_NEED_MORE_ITEMS);
-                return;
-            }
+                return SpellCastResult::SPELL_FAILED_NEED_MORE_ITEMS;
 
             // Still not enough but the reagent is optional, just skip
             continue;
@@ -112,34 +106,15 @@ void Crafting::DoCraft(uint32 craftingDataId)
 
         // If any item provided do not match, probably a cheater, return
         if (!hasOneMatchingItem)
-        {
-            _spell->SendCastResult(SpellCastResult::SPELL_FAILED_NEED_MORE_ITEMS);
-            return;
-        }
+            return SpellCastResult::SPELL_FAILED_NEED_MORE_ITEMS;
     }
 
     uint32 skillLevel = GetSkillLevelForCraft();
     uint32 difficultyPercentMatched = round(float(skillLevel) / float(craftingDifficulty) * 100.f);
 
     uint32 qualityTier = sDB2Manager.GetCraftingQualityTierByDifficultyPercent(_craftingData->CraftingDifficultyID, difficultyPercentMatched);
 
-    // If this is a simple item (no quality), we have the id
-    uint32 newItemId = _craftingData->CraftedItemID;
-
-    // If it's a reagent, get id from CraftingDataItem
-    if (!newItemId)
-    {
-        std::vector<uint32> craftedItemList = sDB2Manager.GetCraftingDataItemIDByCraftingData(_craftingData->ID);
-
-        // If we didn't found anything, we have a problem. Return and don't take reagent from player.
-        if (craftedItemList.size() < qualityTier)
-        {
-            _spell->SendCastResult(SpellCastResult::SPELL_FAILED_ERROR);
-            return;
-        }
-
-        newItemId = craftedItemList[qualityTier - 1];
-    }
+    uint32 newItemId = GetItemIdForQuality(qualityTier);
 
     ItemContext context = _spell->GetSpellInfo()->HasAttribute(SPELL_ATTR0_IS_TRADESKILL) ? ItemContext::Trade_Skill : ItemContext::NONE;
 
@@ -155,12 +130,14 @@ void Crafting::DoCraft(uint32 craftingDataId)
         InitCraftingStatModifier(createdItem);
 
         createdItem->AddToWorld();
-        createdItem->SendUpdateToPlayer(createdItem->GetOwner());
+        createdItem->SendUpdateToPlayer(_player);
     }
 
     // Item has been crafted, remove reagent from player
     for (auto const& [itemId, itemCount] : usedReagentsToDestroy)
         _player->DestroyItemCount(itemId, itemCount, true);
+
+    return SpellCastResult::SPELL_CAST_OK;
 }
 
 uint32 Crafting::GetSkillLevelForCraft()
@@ -241,3 +218,23 @@ void Crafting::InitCraftingStatModifier(Item* item)
             item->SetModifier(ITEM_MODIFIER_CHANGE_MODIFIED_CRAFTING_STAT_2, allowedStats[1]);
     }
 }
+
+uint32 Crafting::GetItemIdForQuality(uint32 qualityTier)
+{
+    // If this is a simple item (no quality), we have the id
+    uint32 newItemId = _craftingData->CraftedItemID;
+
+    // If it's a reagent, get id from CraftingDataItem
+    if (!newItemId)
+    {
+        std::vector<uint32> craftedItemList = sDB2Manager.GetCraftingDataItemIDByCraftingData(_craftingData->ID);
+
+        // If we didn't found anything, we have a problem. Return and don't take reagent from player.
+        if (craftedItemList.size() < qualityTier)
+            return SpellCastResult::SPELL_FAILED_ERROR;
+
+        newItemId = craftedItemList[qualityTier - 1];
+    }
+
+    return newItemId;
+}

src/server/game/Craft/Crafting.h

@@ -31,13 +31,14 @@ class TC_GAME_API Crafting
     Crafting(Player* player, Spell* spell) :
         _player(player), _spell(spell), _craftingData(nullptr) { }
 
-    void DoCraft(uint32 craftingDataId);
+    SpellCastResult DoCraft(uint32 craftingDataId);
 
 private:
     uint32 GetSkillLevelForCraft();
     uint32 GetSkillIdForSpell(uint32 spellId);
     uint32 CalculateTotalReagentWeights();
     void InitCraftingStatModifier(Item* item);
+    uint32 GetItemIdForQuality(uint32 qualityTier);
 
     Player* _player;
     Spell* _spell;

src/server/game/Spells/SpellEffects.cpp

@@ -5995,7 +5995,10 @@ void Spell::EffectCraftItem()
     }
 
     Crafting craftingInstance = Crafting(playerCaster, this);
-    craftingInstance.DoCraft(effectInfo->MiscValue);
+    SpellCastResult result = craftingInstance.DoCraft(effectInfo->MiscValue);
+
+    if (result != SpellCastResult::SPELL_CAST_OK)
+        SendCastResult(result);
 }
 
 void Spell::EffectModifyAuraStacks()