aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorSouler <soulerhyd@gmail.com>2012-02-01 16:02:58 +0100
committerkaelima <kaelima@live.se>2012-02-01 16:02:58 +0100
commiteef0c61bbf287574ceba1e404ce897fc30ccc36e (patch)
treed1f68e6049f3200f1e965caccfa7a0876f57ed00 /src/server/game
parent9b524b43fae3521c0fc0c606b19af80cc12e39a1 (diff)
Script/Spells: Solve problems with argent tournament spells
- Including cleanup in spell_generic
Diffstat (limited to 'src/server/game')
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e02331e00e7..289a600e88a 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -775,7 +775,10 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam
ASSERT(he->duel);
- he->SetHealth(1);
+ if (duel_wasMounted) // In this case victim==mount
+ victim->SetHealth(1);
+ else
+ he->SetHealth(1);
he->duel->opponent->CombatStopWithPets(true);
he->CombatStopWithPets(true);