Core/DataStores: Updated opcodes and db2 to 7.0.3.21414

4 files changed, 4 insertions, 6 deletions

diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 3eba4d58d80..84138cf0b45 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -31,6 +31,7 @@
 #include "WorldSession.h"
 #include "ItemPackets.h"
 #include "TradeData.h"
+#include "GameTables.h"
 
 void AddItemsSetItem(Player* player, Item* item)
 {
@@ -1856,8 +1857,8 @@ int32 Item::GetItemStatValue(uint32 index, Player const* owner) const
     if (uint32 randomPropPoints = GetRandomPropertyPoints(itemLevel, GetQuality(), GetTemplate()->GetInventoryType(), GetTemplate()->GetSubClass()))
     {
         float statValue = float(_bonusData.ItemStatAllocation[index] * randomPropPoints) * 0.0001f;
-        if (GtItemSocketCostPerLevelEntry const* gtCost = sGtItemSocketCostPerLevelStore.EvaluateTable(itemLevel - 1, 0))
-            statValue -= float(int32(_bonusData.ItemStatSocketCostMultiplier[index] * gtCost->ratio));
+        if (GtItemSocketCostPerLevelEntry const* gtCost = sItemSocketCostPerLevelGameTable.GetRow(itemLevel))
+            statValue -= float(int32(_bonusData.ItemStatSocketCostMultiplier[index] * gtCost->SocketCost));
 
         return int32(std::floor(statValue + 0.5f));
     }
diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
index 2f82071f66f..a36a4a4c246 100644
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -21,7 +21,6 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Util.h"
-#include "DBCStores.h"
 
 #include <list>
 #include <vector>
diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp
index 04873bdddcf..67f683849a9 100644
--- a/src/server/game/Entities/Item/ItemTemplate.cpp
+++ b/src/server/game/Entities/Item/ItemTemplate.cpp
@@ -16,7 +16,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "DBCStores.h"
 #include "DB2Stores.h"
 #include "World.h"
 #include "ItemTemplate.h"
diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h
index 38265cc9fed..5fa6b5583af 100644
--- a/src/server/game/Entities/Item/ItemTemplate.h
+++ b/src/server/game/Entities/Item/ItemTemplate.h
@@ -660,11 +660,10 @@ class Player;
 
 struct TC_GAME_API ItemTemplate
 {
-    uint32 Id;
     ItemEntry const* BasicData;
     ItemSparseEntry const* ExtendedData;
 
-    uint32 GetId() const { return Id; }
+    uint32 GetId() const { return BasicData->ID; }
     uint32 GetClass() const { return BasicData->Class; }
     uint32 GetSubClass() const { return BasicData->SubClass; }
     uint32 GetQuality() const { return ExtendedData->Quality; }