diff options
| author | Aokromes <Aokromes@users.noreply.github.com> | 2016-07-06 10:54:36 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-05 00:00:38 +0100 |
| commit | a5f21b4c6239b4d5e01e249b5b3ccf41729dc6f7 (patch) | |
| tree | bccbcd2c472354095ec42824529fe1b5af16f501 | |
| parent | 6d9a0ade7be8282ec489abd033f0676621a99fb5 (diff) | |
Core/Misc: Coding standard (#17521)
(cherry picked from commit a832865ce2656404b126af399b50abd74d952832)
# Conflicts:
# src/server/game/Handlers/PetHandler.cpp
# src/server/game/Spells/Spell.cpp
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 40614ecfa19..a6012ac6a20 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -521,7 +521,7 @@ void WorldSession::HandlePetRename(WorldPackets::Pet::PetRename& packet) Pet* pet = ObjectAccessor::GetPet(*_player, petguid); // check it! - if (!pet || !pet->IsPet() || ((Pet*)pet)->getPetType()!= HUNTER_PET || + if (!pet || !pet->IsPet() || ((Pet*)pet)->getPetType() != HUNTER_PET || !pet->HasByteFlag(UNIT_FIELD_BYTES_2, UNIT_BYTES_2_OFFSET_PET_FLAGS, UNIT_CAN_BE_RENAMED) || pet->GetOwnerGUID() != _player->GetGUID() || !pet->GetCharmInfo()) return; |