diff options
| author | Aokromes <Aokromes@users.noreply.github.com> | 2016-07-06 10:54:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 10:54:36 +0200 |
| commit | a832865ce2656404b126af399b50abd74d952832 (patch) | |
| tree | e2824ff6a17191aac1787776dfa26e180793aa14 /src | |
| parent | e0cc650ea9339996b2b408f8168f6588bd088e42 (diff) | |
Core/Misc: Coding standard (#17521)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 8bfb0070605..17c9c4a58d7 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -595,7 +595,7 @@ void WorldSession::HandlePetRename(WorldPacket& recvData) 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, 2, UNIT_CAN_BE_RENAMED) || pet->GetOwnerGUID() != _player->GetGUID() || !pet->GetCharmInfo()) return; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 63c65dbef43..3cb0048e55f 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -6999,7 +6999,7 @@ SpellCastResult Spell::CanOpenLock(uint32 effIndex, uint32 lockId, SkillType& sk reqSkillValue = lockInfo->Skill[j]; // castitem check: rogue using skeleton keys. the skill values should not be added in this case. - skillValue = m_CastItem || m_caster->GetTypeId()!= TYPEID_PLAYER ? + skillValue = m_CastItem || m_caster->GetTypeId() != TYPEID_PLAYER ? 0 : m_caster->ToPlayer()->GetSkillValue(skillId); // skill bonus provided by casting spell (mostly item spells) |