*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
00ba699d6f
19 files changed
+102
-191
No files matched your search
+2
-12
@@ -161,12 +161,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
|
||||
p->setDeathState(CORPSE);
|
||||
}
|
||||
else // charmed or possessed
|
||||
{
|
||||
if (_player->isPossessing())
|
||||
_player->RemovePossess(true);
|
||||
else
|
||||
_player->Uncharm();
|
||||
}
|
||||
_player->Uncharm();
|
||||
break;
|
||||
default:
|
||||
sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.\n", flag, spellid);
|
||||
@@ -501,12 +496,7 @@ void WorldSession::HandlePetAbandon( WorldPacket & recv_data )
|
||||
_player->RemovePet((Pet*)pet,PET_SAVE_AS_DELETED);
|
||||
}
|
||||
else if(pet->GetGUID() == _player->GetCharmGUID())
|
||||
{
|
||||
if (_player->isPossessing())
|
||||
_player->RemovePossess(true);
|
||||
else
|
||||
_player->Uncharm();
|
||||
}
|
||||
_player->Uncharm();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user