josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Correct target requirement for eyes of the beast and add some crash preventing checks to charm code.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-07-08 22:26:46 +02:00
parent 60e8de1d2e
commit f829ee0dc0
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Spell.cpp
+14 -9
View File
@@ -4998,17 +4998,22 @@ SpellCastResult Spell::CheckCast(bool strict)
return SPELL_FAILED_ALREADY_HAVE_CHARM;
}
Unit *target = m_targets.getUnitTarget();
if(!target || target->GetTypeId() == TYPEID_UNIT
&& ((Creature*)target)->isVehicle())
return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
// Skip TARGET_UNIT_PET - pet is always valid
if (m_spellInfo->EffectImplicitTargetA[i] != TARGET_UNIT_PET
&& m_spellInfo->EffectImplicitTargetB[i] != TARGET_UNIT_PET)
{
Unit *target = m_targets.getUnitTarget();
if(!target || target->GetTypeId() == TYPEID_UNIT
&& ((Creature*)target)->isVehicle())
return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
if(target->GetCharmerGUID())
return SPELL_FAILED_CHARMED;
if(target->GetCharmerGUID())
return SPELL_FAILED_CHARMED;
int32 damage = CalculateDamage(i, target);
if(damage && int32(target->getLevel()) > damage)
return SPELL_FAILED_HIGHLEVEL;
int32 damage = CalculateDamage(i, target);
if(damage && int32(target->getLevel()) > damage)
return SPELL_FAILED_HIGHLEVEL;
}
break;
}
src/game/Unit.cpp
+9 -1
View File
@@ -14033,6 +14033,10 @@ void Unit::SetCharmedBy(Unit* charmer, CharmType type)
if(GetTypeId() == TYPEID_PLAYER && ((Player*)this)->GetTransport())
return;
// Already charmed
if(GetCharmerGUID())
return;
CastStop();
CombatStop(); //TODO: CombatStop(true) may cause crash (interrupt spells)
DeleteThreatList();
@@ -14122,7 +14126,7 @@ void Unit::SetCharmedBy(Unit* charmer, CharmType type)
case CHARM_TYPE_CONVERT:
break;
}
}
}
}
void Unit::RemoveCharmedBy(Unit *charmer)
@@ -14130,6 +14134,10 @@ void Unit::RemoveCharmedBy(Unit *charmer)
if(!isCharmed())
return;
// Charm was not set for unit - return
if (charmer && charmer->m_Controlled.find(this) == charmer->m_Controlled.end())
return;
if(!charmer)
charmer = GetCharmer();
else if(charmer != GetCharmer()) // one aura overrides another?