diff options
| author | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
| commit | bd054b84533305420e368fae85921e43c2382c78 (patch) | |
| tree | 3ad43004b3505717781792afcdb80e7bf389bff2 /src/game/Unit.cpp | |
| parent | e6c3d54e2686b4b7ee9f8ae3bd5815e126b8bfa6 (diff) | |
| parent | 560ca5a2102a082f6712e1a3ec58f9f367532ade (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e74068bfb2d..4cef59a9037 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -3582,12 +3582,12 @@ bool Unit::isInAccessiblePlaceFor(Creature const* c) const bool Unit::IsInWater() const { - return MapManager::Instance().GetBaseMap(GetMapId())->IsInWater(GetPositionX(),GetPositionY(), GetPositionZ()); + return GetBaseMap()->IsInWater(GetPositionX(),GetPositionY(), GetPositionZ()); } bool Unit::IsUnderWater() const { - return MapManager::Instance().GetBaseMap(GetMapId())->IsUnderWater(GetPositionX(),GetPositionY(),GetPositionZ()); + return GetBaseMap()->IsUnderWater(GetPositionX(),GetPositionY(),GetPositionZ()); } void Unit::DeMorph() @@ -12731,6 +12731,10 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag if (triggeredByAura->GetCasterGUID() != pTarget->GetGUID()) continue; break; + case SPELL_AURA_MOD_SPELL_CRIT_CHANCE: + if (!procSpell) + continue; + break; /*case SPELL_AURA_ADD_FLAT_MODIFIER: case SPELL_AURA_ADD_PCT_MODIFIER: // HandleSpellModAuraProc |