*Reinit the iterator in each loop as the iter is removed from the list, in AuctionHouseObject::Update, by Trazom

*No longer disregard z/o in Map::CreatureRelocation, thanks Sisif
*Cleanup, and make Divine Storm default to m_caster is no unitTarget is available
*Some mtmaps optimization

--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-31 16:00:47 -07:00
parent f5696bcca5
commit 743578b81f
8 changed files with 106 additions and 105 deletions
+3 -3
View File
@@ -1252,7 +1252,7 @@ void Player::Update( uint32 p_time )
else
{
// prevent base and off attack in same time, delay attack at 0.2 sec
if(getAttackTimer(BASE_ATTACK) < ATTACK_DISPLAY_DELAY)
if (getAttackTimer(BASE_ATTACK) < ATTACK_DISPLAY_DELAY)
setAttackTimer(BASE_ATTACK,ATTACK_DISPLAY_DELAY);
// do attack
@@ -1372,9 +1372,9 @@ void Player::Update( uint32 p_time )
}
// not auto-free ghost from body in instances
#pragma omp critical(UpdateThreadSafety)
if(m_deathTimer > 0 && !GetBaseMap()->Instanceable())
{
#pragma omp critical(UpdateThreadSafety)
if(p_time >= m_deathTimer)
{
m_deathTimer = 0;
@@ -1392,7 +1392,7 @@ void Player::Update( uint32 p_time )
SendUpdateToOutOfRangeGroupMembers();
Pet* pet = GetPet();
if(pet && !IsWithinDistInMap(pet, OWNER_MAX_DISTANCE) && !pet->isPossessed())
if (pet && !IsWithinDistInMap(pet, OWNER_MAX_DISTANCE) && !pet->isPossessed())
//if(pet && !IsWithinDistInMap(pet, OWNER_MAX_DISTANCE) && (GetCharmGUID() && (pet->GetGUID() != GetCharmGUID())))
RemovePet(pet, PET_SAVE_NOT_IN_SLOT, true);