Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-25 20:53:25 -06:00
parent bf66375bc7 dea0b1c5a6
commit 58d01932af
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/GroupHandler.cpp
View File

@@ -722,7 +722,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
{
if(auramask & (uint64(1) << i))
{
uint32 updatedAura=player->GetUInt32Value(UNIT_FIELD_AURA + i);
uint32 updatedAura=player->GetUInt32Value(uint16(UNIT_FIELD_AURA + i));
*data << uint16(updatedAura);
*data << uint8(1);
//TODO: find a safe place to do this cleanup
@@ -807,7 +807,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
{
if(auramask & (uint64(1) << i))
{
uint32 updatedAura=pet->GetUInt32Value(UNIT_FIELD_AURA + i);
uint32 updatedAura=pet->GetUInt32Value(uint16(UNIT_FIELD_AURA + i));
*data << uint16(updatedAura);
*data << uint8(1);
//TODO: find a safe place to do this cleanup

3
src/game/Spell.cpp
View File

@@ -1171,7 +1171,10 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask)
// assisting case, healing and resurrection
if(unit->hasUnitState(UNIT_STAT_ATTACK_PLAYER))
{
m_caster->SetContestedPvP();
if m_caster->UpdatePvP(true);
}
if( unit->isInCombat() && !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_NO_INITIAL_AGGRO) )
{
m_caster->SetInCombatState(unit->GetCombatTimer() > 0);

4
src/game/Unit.cpp
View File

@@ -5502,7 +5502,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
// 41409 Dementia: Every 5 seconds either gives you -5% damage/healing. (Druid, Shaman, Priest, Warlock, Mage, Paladin)
case 39446:
{
if(GetTypeId() != TYPEID_PLAYER)
if(GetTypeId() != TYPEID_PLAYER || !this->isAlive())
return false;
// Select class defined buff
@@ -12635,6 +12635,8 @@ bool Unit::HandleMeandingAuraProc( Aura* triggeredByAura )
caster->AddSpellMod(mod, true);
CastCustomSpell(target,spellProto->Id,&heal,NULL,NULL,true,NULL,triggeredByAura,caster->GetGUID());
caster->AddSpellMod(mod, false);
heal = caster->SpellHealingBonus(spellProto, heal, HEAL, this);
}
}
}