mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
Merge remote branch 'origin/master' into 330
This commit is contained in:
commit
4c8dd37612
46 changed files with 189 additions and 156 deletions
|
|
@ -6383,7 +6383,7 @@ void Spell::DoSummonTotem(SpellEffectIndex eff_idx, uint8 slot_dbc)
|
|||
m_caster->_AddTotem(TotemSlot(slot),pTotem);
|
||||
|
||||
pTotem->SetOwner(m_caster->GetGUID());
|
||||
pTotem->SetTypeBySummonSpell(m_spellInfo); // must be after Create call where m_spells initilized
|
||||
pTotem->SetTypeBySummonSpell(m_spellInfo); // must be after Create call where m_spells initialized
|
||||
|
||||
int32 duration=GetSpellDuration(m_spellInfo);
|
||||
if (Player* modOwner = m_caster->GetSpellModOwner())
|
||||
|
|
@ -7497,7 +7497,7 @@ void Spell::EffectBind(SpellEffectIndex eff_idx)
|
|||
data.Initialize(SMSG_PLAYERBOUND, 8+4);
|
||||
data << uint64(player->GetGUID());
|
||||
data << uint32(area_id);
|
||||
player->SendMessageToSet( &data, true );
|
||||
player->SendDirectMessage( &data );
|
||||
}
|
||||
|
||||
void Spell::EffectRestoreItemCharges( SpellEffectIndex eff_idx )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue