*Merge.
--HG-- branch : trunk rename : sql/updates/XXX_characters_auctionhouse.sql => sql/updates/1164_characters.sql
This commit is contained in:
+15
-24
@@ -17597,19 +17597,7 @@ void Player::HandleStealthedUnitsDetection()
|
||||
sLog.outDebug("Object %u (Type: %u) is detected in stealth by player %u. Distance = %f",(*i)->GetGUIDLow(),(*i)->GetTypeId(),GetGUIDLow(),GetDistance(*i));
|
||||
#endif
|
||||
|
||||
// target aura duration for caster show only if target exist at caster client
|
||||
// send data at target visibility change (adding to client)
|
||||
if((*i)!=this && (*i)->isType(TYPEMASK_UNIT))
|
||||
{
|
||||
SendAurasForTarget(*i);
|
||||
//if(((Unit*)(*i))->isAlive()) //should be always alive
|
||||
{
|
||||
if((*i)->GetTypeId()==TYPEID_UNIT)
|
||||
((Creature*)(*i))->SendMonsterMoveWithSpeedToCurrentDestination(this);
|
||||
if(((Unit*)(*i))->getVictim())
|
||||
((Unit*)(*i))->SendAttackStart(((Unit*)(*i))->getVictim());
|
||||
}
|
||||
}
|
||||
SendInitialVisiblePackets(*i);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18710,21 +18698,24 @@ void Player::UpdateVisibilityOf(WorldObject* target)
|
||||
|
||||
// target aura duration for caster show only if target exist at caster client
|
||||
// send data at target visibility change (adding to client)
|
||||
if(target!=this && target->isType(TYPEMASK_UNIT))
|
||||
{
|
||||
SendAurasForTarget((Unit*)target);
|
||||
if(((Unit*)target)->isAlive())
|
||||
{
|
||||
if(target->GetTypeId()==TYPEID_UNIT)
|
||||
((Creature*)target)->SendMonsterMoveWithSpeedToCurrentDestination(this);
|
||||
if(((Unit*)target)->getVictim())
|
||||
((Unit*)target)->SendAttackStart(((Unit*)target)->getVictim());
|
||||
}
|
||||
}
|
||||
if(target->isType(TYPEMASK_UNIT))
|
||||
SendInitialVisiblePackets((Unit*)target);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Player::SendInitialVisiblePackets(Unit* target)
|
||||
{
|
||||
SendAurasForTarget(target);
|
||||
if(target->isAlive())
|
||||
{
|
||||
if(target->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE)
|
||||
target->SendMonsterMoveWithSpeedToCurrentDestination(this);
|
||||
if(target->hasUnitState(UNIT_STAT_MELEE_ATTACKING) && target->getVictim())
|
||||
target->SendAttackStart(target->getVictim());
|
||||
}
|
||||
}
|
||||
|
||||
template<class T>
|
||||
inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, T* target)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user