Core/Misc: Finish cleanup of incorrectly merged Raise Ally fix (Branch 3.3.5 only)
This commit is contained in:
1 parent
c5d909693b
commit
6fe7da9cd7
7 files changed
+8
-16
No files matched your search
@@ -4281,8 +4281,9 @@ void Spell::SendResurrectRequest(Player* target)
|
||||
{
|
||||
// get resurrector name for creature resurrections, otherwise packet will be not accepted
|
||||
// for player resurrections the name is looked up by guid
|
||||
std::string const sentName(m_caster->GetTypeId() == TYPEID_PLAYER ?
|
||||
"" : m_caster->GetNameForLocaleIdx(target->GetSession()->GetSessionDbLocaleIndex()));
|
||||
std::string const sentName(m_caster->GetTypeId() == TYPEID_PLAYER
|
||||
? ""
|
||||
: m_caster->GetNameForLocaleIdx(target->GetSession()->GetSessionDbLocaleIndex()));
|
||||
|
||||
WorldPacket data(SMSG_RESURRECT_REQUEST, (8+4+sentName.size()+1+1+1+4));
|
||||
data << uint64(m_caster->GetGUID());
|
||||
@@ -5615,7 +5616,7 @@ SpellCastResult Spell::CheckPetCast(Unit* target)
|
||||
|
||||
// dead owner (pets still alive when owners ressed?)
|
||||
if (Unit* owner = m_caster->GetCharmerOrOwner())
|
||||
if (!owner->IsAlive() && !owner->IsGhouled())
|
||||
if (!owner->IsAlive())
|
||||
return SPELL_FAILED_CASTER_DEAD;
|
||||
|
||||
if (!target && m_targets.GetUnitTarget())
|
||||
|
||||
Reference in new issue
Block a user