*Rolback changes to player.cpp pushed by mistake.

--HG--
branch : trunk
This commit is contained in:
QAston
2009-04-13 20:53:31 +02:00
parent f46d1b3b81
commit ae7bfa3ae2
+5 -4
View File
@@ -16454,18 +16454,19 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
}
}
pet->SavePetToDB(mode);
// only if current pet in slot
switch(pet->getPetType())
{
case POSSESSED_PET:
pet->RemoveCharmedOrPossessedBy(NULL);
break;
default:
SetGuardian(pet, false);
pet->SavePetToDB(mode);
break;
}
SetGuardian(pet, false);
pet->CleanupsBeforeDelete();
pet->AddObjectToRemoveList();
pet->m_removed = true;
@@ -17987,7 +17988,7 @@ bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool
return false;
}
if(u->GetVisibility() == VISIBILITY_OFF)
if(u->GetVisibility() == VISIBILITY_OFF || u->m_invisibilityMask )
{
// GMs see any players, not higher GMs and all units
if(isGameMaster())