diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-30 15:46:00 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-30 15:46:00 +0100 |
| commit | 94c8c7ec4e3a1cf625bee0bab77f8814253ddf0d (patch) | |
| tree | d8a1f5748f9c8f381c9d071c299470c195f8107d /src/server/scripts/Spells | |
| parent | 35412ddc3c5bb08f8640aa429fc4e1e4791fe2fd (diff) | |
| parent | 8ac05aff2dc2adf94604bc5ce94d489c7311693d (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Battlefield/BattlefieldMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_paladin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 3570c9e8d75..34a54f91a2e 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -627,7 +627,7 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader bool Load() { - + if (Unit* caster = GetCaster()) { if (caster->GetTypeId() == TYPEID_PLAYER) |