mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 310

Browse source
This commit is contained in:
tomrus88 2009-06-05 14:54:05 +04:00
commit 4236f7c75c
21 changed files with 173 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Unit.cpp
View file

@ -5093,8 +5093,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
target = GetPet();
if (!target)
return false;
basepoints0 = damage * 15 / 100;
triggered_spell_id = 54181;
basepoints0 = damage * triggerAmount / 100;
break;
}
switch(dummySpell->Id)
@ -11689,4 +11689,4 @@ void Unit::SetPvP( bool state )
if(m_TotemSlot[i])
if(Creature *totem = GetMap()->GetCreature(m_TotemSlot[i]))
totem->SetPvP(state);
}
}