From e6c874db138c27c1151b0896ae5840f607bbb340 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 26 May 2010 19:10:13 +0400 Subject: [PATCH] [9975] Use special function for honored/xp kill check --- src/game/SpellAuras.cpp | 6 +++--- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index a82653051..5eeba59c5 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3519,8 +3519,8 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real) if (spellInfo->EffectItemType[m_effIndex] == 6265) { // Only from non-grey units - if ((victim->getLevel() <= MaNGOS::XP::GetGrayLevel(caster->getLevel()) || - victim->GetTypeId() == TYPEID_UNIT && !((Player*)caster)->isAllowedToLoot((Creature*)victim))) + if (!((Player*)caster)->isHonorOrXPTarget(victim) || + victim->GetTypeId() == TYPEID_UNIT && !((Player*)caster)->isAllowedToLoot((Creature*)victim)) return; } @@ -7190,7 +7190,7 @@ void Aura::PeriodicTick() { // Only from non-grey units if (roll_chance_i(10) && // 1-2 from drain with final and without glyph, 0-1 from damage - m_target->getLevel() > MaNGOS::XP::GetGrayLevel(pCaster->getLevel()) && + ((Player*)pCaster)->isHonorOrXPTarget(m_target) && (m_target->GetTypeId() != TYPEID_UNIT || ((Player*)pCaster)->isAllowedToLoot((Creature*)m_target))) { pCaster->CastSpell(pCaster, 43836, true, NULL, this); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 81f397c23..39fb7e86c 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9974" + #define REVISION_NR "9975" #endif // __REVISION_NR_H__