Core/Spells: Removed leftovers of old cooldown handling

* Use ItemEffect.db2 data directly instead of copying it to another structure

2 files changed, 3 insertions, 17 deletions

diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 0c88ea937e7..5534b6e08e3 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -289,8 +289,8 @@ bool Item::Create(ObjectGuid::LowType guidlow, uint32 itemid, Player const* owne
     SetUInt32Value(ITEM_FIELD_MAXDURABILITY, itemProto->MaxDurability);
     SetUInt32Value(ITEM_FIELD_DURABILITY, itemProto->MaxDurability);
 
-    for (uint8 i = 0; i < itemProto->Effects.size(); ++i)
-        SetSpellCharges(i, itemProto->Effects[i].Charges);
+    for (uint8 i = 0; i < itemProto->Effects.size() && i < 5; ++i)
+        SetSpellCharges(i, itemProto->Effects[i]->Charges);
 
     SetUInt32Value(ITEM_FIELD_DURATION, itemProto->GetDuration());
     SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, 0);
diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h
index 0a089a09b15..abba96cf6dc 100644
--- a/src/server/game/Entities/Item/ItemTemplate.h
+++ b/src/server/game/Entities/Item/ItemTemplate.h
@@ -581,20 +581,6 @@ const uint32 MaxItemSubclassValues[MAX_ITEM_CLASS] =
     MAX_ITEM_SUBCLASS_GLYPH
 };
 
-#pragma pack(push, 1)
-
-struct ItemEffect
-{
-    uint32  SpellID;
-    uint32  Trigger;
-    int32   Charges;
-    int32   Cooldown;
-    uint32  Category;
-    int32   CategoryCooldown;
-};
-
-#pragma pack(pop)
-
 #define MIN_ITEM_LEVEL 1
 #define MAX_ITEM_LEVEL 1000
 
@@ -657,7 +643,7 @@ struct ItemTemplate
     void GetBaseDamage(float& minDamage, float& maxDamage) const { GetDamage(ExtendedData->ItemLevel, minDamage, maxDamage); }
 
     uint32 MaxDurability;
-    std::vector<ItemEffect> Effects;
+    std::vector<ItemEffectEntry const*> Effects;
 
     // extra fields, not part of db2 files
     uint32 ScriptId;