diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-03-12 18:20:26 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-03-12 23:11:49 +0100 |
| commit | 007b5a68c50bbee7d05acec888d3273c2a5a8577 (patch) | |
| tree | 4818b60a73730b98ae4785d0630edbd6cd27d5bf /src/server/game/Handlers/ItemHandler.cpp | |
| parent | 50a912af72ca84095eab5effa7d70e8a50ff8a04 (diff) | |
Core/DataStores: Fixed db2 structures after 7.3.5
Diffstat (limited to 'src/server/game/Handlers/ItemHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ItemHandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 81f9d82dee8..1b1910abdc5 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -1077,8 +1077,8 @@ void WorldSession::HandleSocketGems(WorldPackets::Item::SocketGems& socketGems) itemTarget->SetGem(i, &gemData[i], gemScalingLevel); - if (gemProperties[i] && gemProperties[i]->EnchantID) - itemTarget->SetEnchantment(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT + i), gemProperties[i]->EnchantID, 0, 0, _player->GetGUID()); + if (gemProperties[i] && gemProperties[i]->EnchantId) + itemTarget->SetEnchantment(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT + i), gemProperties[i]->EnchantId, 0, 0, _player->GetGUID()); uint32 gemCount = 1; _player->DestroyItemCount(gems[i], gemCount, true); @@ -1189,7 +1189,7 @@ void WorldSession::HandleUseCritterItem(WorldPackets::Item::UseCritterItem& useC if (item->GetTemplate()->Effects.size() < 2) return; - uint32 spellToLearn = item->GetTemplate()->Effects[1]->SpellID; + int32 spellToLearn = item->GetTemplate()->Effects[1]->SpellID; for (BattlePetSpeciesEntry const* entry : sBattlePetSpeciesStore) { if (entry->SummonSpellID == spellToLearn) @@ -1233,16 +1233,16 @@ void WorldSession::HandleUpgradeItem(WorldPackets::Item::UpgradeItem& upgradeIte } // Check if player has enough currency - if (!_player->HasCurrency(itemUpgradeEntry->CurrencyID, itemUpgradeEntry->CurrencyCost)) + if (!_player->HasCurrency(itemUpgradeEntry->CurrencyType, itemUpgradeEntry->CurrencyAmount)) { - TC_LOG_DEBUG("network", "WORLD: HandleUpgradeItems - Player has not enougth currency (ID: %u, Cost: %u) not found.", itemUpgradeEntry->CurrencyID, itemUpgradeEntry->CurrencyCost); + TC_LOG_DEBUG("network", "WORLD: HandleUpgradeItems - Player has not enougth currency (ID: %u, Cost: %u) not found.", itemUpgradeEntry->CurrencyType, itemUpgradeEntry->CurrencyAmount); itemUpgradeResult.Success = false; SendPacket(itemUpgradeResult.Write()); return; } uint32 currentUpgradeId = item->GetModifier(ITEM_MODIFIER_UPGRADE_ID); - if (currentUpgradeId != itemUpgradeEntry->PrevItemUpgradeID) + if (currentUpgradeId != itemUpgradeEntry->PrerequisiteID) { TC_LOG_DEBUG("network", "WORLD: HandleUpgradeItems - ItemUpgradeEntry (%u) is not related to this ItemUpgradePath (%u).", itemUpgradeEntry->ID, currentUpgradeId); itemUpgradeResult.Success = false; @@ -1262,7 +1262,7 @@ void WorldSession::HandleUpgradeItem(WorldPackets::Item::UpgradeItem& upgradeIte _player->_ApplyItemBonuses(item, item->GetSlot(), true); item->SetState(ITEM_CHANGED, _player); - _player->ModifyCurrency(itemUpgradeEntry->CurrencyID, -int32(itemUpgradeEntry->CurrencyCost)); + _player->ModifyCurrency(itemUpgradeEntry->CurrencyType, -int32(itemUpgradeEntry->CurrencyAmount)); } void WorldSession::HandleSortBags(WorldPackets::Item::SortBags& /*sortBags*/) |