aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXanadu <none@none>2010-03-20 18:49:50 +0100
committerXanadu <none@none>2010-03-20 18:49:50 +0100
commit830062779ebe78d3c7044b1185bc1eb965b1a2aa (patch)
tree5c049b1cf25da298d1c7f3db7ec85ba130bbb35d /src
parentb651b592ef49faf93c82548398a96aab940e404a (diff)
Improved the kill proc slightly.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Unit.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 0a6f3493572..919e35b4720 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -14589,14 +14589,13 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
player->RewardPlayerAndGroupAtKill(pVictim);
}
- // Do KILL and KILLED procs. KILL proc is called only for the unit who landed the killing blow (or its owner - for pets) regardless of who tapped the victim
- if (isPet())
+ // Do KILL and KILLED procs. KILL proc is called only for the unit who landed the killing blow (and its owner - for pets and totems) regardless of who tapped the victim
+ if (isPet() || isTotem())
{
if (Unit *owner = GetOwner())
owner->ProcDamageAndSpell(pVictim, PROC_FLAG_KILL, PROC_FLAG_KILLED, PROC_EX_NONE, 0);
}
- else
- ProcDamageAndSpell(pVictim, PROC_FLAG_KILL, PROC_FLAG_KILLED, PROC_EX_NONE, 0);
+ ProcDamageAndSpell(pVictim, PROC_FLAG_KILL, PROC_FLAG_KILLED, PROC_EX_NONE, 0);
// Proc auras on death - must be before aura/combat remove
pVictim->ProcDamageAndSpell(NULL, PROC_FLAG_DEATH, PROC_FLAG_NONE, PROC_EX_NONE, 0, BASE_ATTACK, 0);