aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-12-16 16:00:56 +0100
committerMachiavelli <none@none>2010-12-16 16:00:56 +0100
commitbb7bd9ef45cd15c7da271c690f5c798cdd340b22 (patch)
tree5bd1306a342ed41c7ad0ebaa37373b5e3fca6b7b /src/server
parent46715001720f9ec8bf8e0164c2abcd262822868d (diff)
Core/Spells: Fix a possible crash in spell_hun_readiness_SpellScript
--HG-- branch : trunk
Diffstat (limited to 'src/server')
-rw-r--r--src/server/scripts/Spells/spell_hunter.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 5c21563123f..98a7619c82c 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -275,7 +275,9 @@ public:
{
SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
- if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER &&
+ ///! If spellId in cooldown map isn't valid, the above will return a null pointer.
+ if (spellInfo &&
+ spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER &&
spellInfo->Id != HUNTER_SPELL_READINESS &&
spellInfo->Id != HUNTER_SPELL_BESTIAL_WRATH &&
GetSpellRecoveryTime(spellInfo) > 0)