diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 2d7d98579a8..ae14d5ebc30 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16454,19 +16454,18 @@ 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: - pet->SavePetToDB(mode); + SetGuardian(pet, false); break; } - SetGuardian(pet, false); - pet->CleanupsBeforeDelete(); pet->AddObjectToRemoveList(); pet->m_removed = true; @@ -17988,7 +17987,7 @@ bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool return false; } - if(u->GetVisibility() == VISIBILITY_OFF || u->m_invisibilityMask ) + if(u->GetVisibility() == VISIBILITY_OFF) { // GMs see any players, not higher GMs and all units if(isGameMaster()) |