diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-05 20:09:48 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-05 20:09:48 +0100 |
| commit | cc281616704abbfba9c065e26eeb3395d9fc1152 (patch) | |
| tree | ec78700b135507b8988d1837e261ce40a6c51cf6 /src/server/game/Spells/SpellMgr.cpp | |
| parent | 7da92908b8e176248db4d87217f0adf48318fd15 (diff) | |
| parent | ca440756a8e7eba24e7f9e304ca00347123af2fa (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index d74263e8588..5da12ff1d52 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1135,7 +1135,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 case 68719: // Oil Refinery - Isle of Conquest. case 68720: // Quarry - Isle of Conquest. { - if (player->GetBattlegroundTypeId() != BATTLEGROUND_IC || !player->GetBattleground()) + if (!player || player->GetBattlegroundTypeId() != BATTLEGROUND_IC || !player->GetBattleground()) return false; uint8 nodeType = spellId == 68719 ? NODE_TYPE_REFINERY : NODE_TYPE_QUARRY; |