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

[11536] Override Unit::SetPhaseMask for players, move some functionality from Aura::HandlePhase

Browse source
This commit is contained in:
SilverIce 2011-05-25 04:20:50 +03:00
parent 78a4460501
commit 4bb2d662a2
4 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/Player.cpp
View file

@ -19980,6 +19980,20 @@ template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Corpse*
template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, GameObject* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, DynamicObject* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
void Player::SetPhaseMask(uint32 newPhaseMask, bool update)
{
// GM-mode have mask PHASEMASK_ANYWHERE always
if (isGameMaster())
newPhaseMask = PHASEMASK_ANYWHERE;
// phase auras normally not expected at BG but anyway better check
if (BattleGround *bg = GetBattleGround())
bg->EventPlayerDroppedFlag(this);
Unit::SetPhaseMask(newPhaseMask, update);
GetSession()->SendSetPhaseShift(GetPhaseMask());
}
void Player::InitPrimaryProfessions()
{
SetFreePrimaryProfessions(sWorld.getConfig(CONFIG_UINT32_MAX_PRIMARY_TRADE_SKILL));

2
src/game/Player.h
View file

@ -2235,6 +2235,8 @@ class MANGOS_DLL_SPEC Player : public Unit
Camera& GetCamera() { return m_camera; }
virtual void SetPhaseMask(uint32 newPhaseMask, bool update);// overwrite Unit::SetPhaseMask
uint8 m_forced_speed_changes[MAX_MOVE_TYPE];
bool HasAtLoginFlag(AtLoginFlags f) const { return m_atLoginFlags & f; }

49
src/game/SpellAuras.cpp
View file

@ -8214,49 +8214,30 @@ void Aura::HandlePhase(bool apply, bool Real)
target->RemoveAurasDueToSpell(phases.front()->GetId(), GetHolder());
}
target->SetPhaseMask(apply ? GetMiscValue() : PHASEMASK_NORMAL, true);
// no-phase is also phase state so same code for apply and remove
// phase auras normally not expected at BG but anyway better check
if(target->GetTypeId() == TYPEID_PLAYER)
if (GetEffIndex() == EFFECT_INDEX_0 && target->GetTypeId() == TYPEID_PLAYER)
{
// drop flag at invisible in bg
if(((Player*)target)->InBattleGround())
if(BattleGround *bg = ((Player*)target)->GetBattleGround())
bg->EventPlayerDroppedFlag((Player*)target);
// GM-mode have mask 0xFFFFFFFF
if(!((Player*)target)->isGameMaster())
target->SetPhaseMask(apply ? GetMiscValue() : PHASEMASK_NORMAL, false);
((Player*)target)->GetSession()->SendSetPhaseShift(apply ? GetMiscValue() : PHASEMASK_NORMAL);
if (GetEffIndex() == EFFECT_INDEX_0)
SpellAreaForAreaMapBounds saBounds = sSpellMgr.GetSpellAreaForAuraMapBounds(GetId());
if(saBounds.first != saBounds.second)
{
SpellAreaForAreaMapBounds saBounds = sSpellMgr.GetSpellAreaForAuraMapBounds(GetId());
if(saBounds.first != saBounds.second)
{
uint32 zone, area;
target->GetZoneAndAreaId(zone, area);
uint32 zone, area;
target->GetZoneAndAreaId(zone, area);
for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
{
// some auras remove at aura remove
if(!itr->second->IsFitToRequirements((Player*)target, zone, area))
target->RemoveAurasDueToSpell(itr->second->spellId);
// some auras applied at aura apply
else if(itr->second->autocast)
{
// some auras remove at aura remove
if(!itr->second->IsFitToRequirements((Player*)target, zone, area))
target->RemoveAurasDueToSpell(itr->second->spellId);
// some auras applied at aura apply
else if(itr->second->autocast)
{
if (!target->HasAura(itr->second->spellId, EFFECT_INDEX_0))
target->CastSpell(target, itr->second->spellId, true);
}
if (!target->HasAura(itr->second->spellId, EFFECT_INDEX_0))
target->CastSpell(target, itr->second->spellId, true);
}
}
}
}
else
target->SetPhaseMask(apply ? GetMiscValue() : PHASEMASK_NORMAL, false);
target->UpdateVisibilityAndView();
}
void Aura::HandleAuraSafeFall( bool Apply, bool Real )

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11535"
#define REVISION_NR "11536"
#endif // __REVISION_NR_H__