From f46d1b3b81e1d1b5cdca1d84f78fd9e39041a297 Mon Sep 17 00:00:00 2001 From: QAston Date: Mon, 13 Apr 2009 20:50:52 +0200 Subject: *Add some debug info to procflag *Fix Sudden Death. --HG-- branch : trunk --- src/game/Player.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/game/Player.cpp') 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()) -- cgit v1.2.3