Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed spell Righteous Defense

Browse Source 
--HG--
branch : trunk
This commit is contained in:
n0n4m3
2009-12-20 15:11:57 +01:00
parent 89a2d7e46c
commit c412c437a3
2 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/Spell.cpp
View File

@@ -4795,6 +4795,16 @@ SpellCastResult Spell::CheckCast(bool strict)
if(!m_caster->FindNearestCreature(28653,5))
return SPELL_FAILED_OUT_OF_RANGE;
}
else if (m_spellInfo->Id == 31789) // Righteous Defense
{
if (m_caster->GetTypeId() != TYPEID_PLAYER)
return SPELL_FAILED_DONT_REPORT;
Unit* target = m_targets.getUnitTarget();
if (!target || !target->IsFriendlyTo(m_caster) || target->getAttackers().empty())
return SPELL_FAILED_BAD_TARGETS;
}
break;
}
case SPELL_EFFECT_LEARN_SPELL:
@@ -5102,10 +5112,8 @@ SpellCastResult Spell::CheckCast(bool strict)
if (!target || target->GetTypeId() != TYPEID_PLAYER)
return SPELL_FAILED_BAD_TARGETS;
const Group* casterGroup = ((Player*)m_caster)->GetGroup();
bool isInSameRaidOrGroup = casterGroup && casterGroup == ((Player*)target)->GetGroup();
if (m_caster != target && !isInSameRaidOrGroup)
return SPELL_FAILED_BAD_TARGETS;
if (!((Player*)m_caster)->IsInSameRaidWith(((Player*)target)))
return SPELL_FAILED_TARGET_NOT_IN_RAID;
break;
}

27
src/game/SpellEffects.cpp
View File

@@ -1892,37 +1892,12 @@ void Spell::EffectDummy(uint32 i)
}
case 31789: // Righteous Defense (step 1)
{
if (m_caster->GetTypeId() != TYPEID_PLAYER)
{
SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
return;
}
// 31989 -> dummy effect (step 1) + dummy effect (step 2) -> 31709 (taunt like spell for each target)
Unit* friendTarget = !unitTarget || unitTarget->IsFriendlyTo(m_caster) ? unitTarget : unitTarget->getVictim();
if (friendTarget)
{
Player* player = friendTarget->GetCharmerOrOwnerPlayerOrPlayerItself();
if (!player || !player->IsInSameRaidWith((Player*)m_caster))
friendTarget = NULL;
}
// non-standard cast requirement check
if (!friendTarget || friendTarget->getAttackers().empty())
{
((Player*)m_caster)->RemoveSpellCooldown(m_spellInfo->Id,true);
SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
return;
}
// Righteous Defense (step 2) (in old version 31980 dummy effect)
// Clear targets for eff 1
for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
ihit->effectMask &= ~(1<<1);
// not empty (checked), copy
Unit::AttackerSet attackers = friendTarget->getAttackers();
Unit::AttackerSet attackers = unitTarget->getAttackers();
// selected from list 3
for(int i = 0; i < std::min(size_t(3),attackers.size()); ++i)