diff options
| author | joschiwald <joschiwald@online.de> | 2012-05-28 04:27:51 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald@online.de> | 2012-05-28 04:27:51 +0200 |
| commit | cd7ab6f3a5e86e51d19621ce5ab5560cd7eb62bc (patch) | |
| tree | 3e13fd8e4472a3dece8e6691df794f87bfe3e59d /src/server/scripts/EasternKingdoms/undercity.cpp | |
| parent | ca07f30d0359bf5a6eecba8b9cc68702eca4071b (diff) | |
| parent | 9c417ff931a98a2ba35b30e76f8967c7f841e868 (diff) | |
Merge branch 'master' of github.com:joschiwald/TrinityCore into spellscripts
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Spells/spell_paladin.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms/undercity.cpp')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/undercity.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index d5896812007..a9b627ded34 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -184,7 +184,7 @@ public: { if (Unit* victim = me->getVictim()) { - DoCast(me->getVictim(), SPELL_BLACK_ARROW); + DoCast(victim, SPELL_BLACK_ARROW); BlackArrowTimer = 15000 + rand()%5000; } } else BlackArrowTimer -= diff; @@ -193,7 +193,7 @@ public: { if (Unit* victim = me->getVictim()) { - DoCast(me->getVictim(), SPELL_SHOT); + DoCast(victim, SPELL_SHOT); ShotTimer = 8000 + rand()%2000; } } else ShotTimer -= diff; @@ -202,7 +202,7 @@ public: { if (Unit* victim = me->getVictim()) { - DoCast(me->getVictim(), SPELL_MULTI_SHOT); + DoCast(victim, SPELL_MULTI_SHOT); MultiShotTimer = 10000 + rand()%3000; } } else MultiShotTimer -= diff; |