diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-20 22:39:37 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-20 22:39:37 +0200 |
| commit | f767aef12eaf2e55deed89590eb9e8a39b0d1653 (patch) | |
| tree | c8737ba6d3d7065daf61046ed9d424d7bfc7c5e0 /src/server/scripts/Spells | |
| parent | 8e288dd6731ed608d8285f9f966783ee9b46eebf (diff) | |
| parent | 72d08a146f3ca8369f173b9293d564673155491a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_druid.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 0d7d8b61501..9c04aaa7578 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -459,7 +459,10 @@ class spell_dru_innervate : public SpellScriptLoader void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) { - amount = CalculatePct(int32(GetUnitOwner()->GetCreatePowers(POWER_MANA) / aurEff->GetTotalTicks()), amount); + if (Unit* caster = GetCaster()) + amount = int32(CalculatePct(caster->GetCreatePowers(POWER_MANA), amount) / aurEff->GetTotalTicks()); + else + amount = 0; } void Register() override |