*Merge
--HG-- branch : trunk
This commit is contained in:
commit
741b51cc47
29 files changed
+608
-540
No files matched your search
@@ -1340,13 +1340,13 @@ void Spell::EffectDummy(uint32 i)
|
||||
m_caster->CastCustomSpell(m_caster,34846,&chargeBasePoints0,NULL,NULL,true);
|
||||
return;
|
||||
}
|
||||
//Slam
|
||||
if(m_spellInfo->SpellFamilyFlags[0] & 0x200000 && m_spellInfo->SpellIconID == 559)
|
||||
{
|
||||
int32 bp0 = damage;
|
||||
m_caster->CastCustomSpell(unitTarget, 50783, &bp0, NULL, NULL, true, 0);
|
||||
//Slam
|
||||
if(m_spellInfo->SpellFamilyFlags[0] & 0x200000 && m_spellInfo->SpellIconID == 559)
|
||||
{
|
||||
int32 bp0 = damage;
|
||||
m_caster->CastCustomSpell(unitTarget, 50783, &bp0, NULL, NULL, true, 0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Execute
|
||||
if(m_spellInfo->SpellFamilyFlags[0] & 0x20000000)
|
||||
{
|
||||
@@ -5818,15 +5818,15 @@ void Spell::EffectSummonDeadPet(uint32 /*i*/)
|
||||
return;
|
||||
if(damage < 0)
|
||||
return;
|
||||
|
||||
pet->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0);
|
||||
pet->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
|
||||
pet->setDeathState( ALIVE );
|
||||
pet->clearUnitState(UNIT_STAT_ALL_STATE);
|
||||
pet->SetHealth( uint32(pet->GetMaxHealth()*(float(damage)/100)));
|
||||
|
||||
pet->AIM_Initialize();
|
||||
|
||||
_player->PetSpellInitialize();
|
||||
//pet->AIM_Initialize();
|
||||
//_player->PetSpellInitialize();
|
||||
pet->SavePetToDB(PET_SAVE_AS_CURRENT);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user