diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-12-25 15:50:21 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2017-12-25 16:34:36 +0100 |
| commit | ad56299846a92c2cda84ebcc2d37d9aa6e3e8024 (patch) | |
| tree | 4ad77259e6b3cb1b5be227f425f710a75a045beb /src/server/game/Entities | |
| parent | cbc7642edd4a45068636adb98d74332837ab4c71 (diff) | |
Core/Misc: Fix static analysis issues
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8167076a00f..26ea8582f23 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16534,7 +16534,7 @@ bool Player::HasQuestForItem(uint32 itemid, uint32 excludeQuestId /* 0 */, bool // examined item is a source item if (qinfo->ItemDrop[j] == itemid) { - ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(itemid); + ItemTemplate const* pProto = ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(itemid)); uint32 ownedCount = GetItemCount(itemid, true); // 'unique' item if ((pProto->MaxCount && int32(ownedCount) < pProto->MaxCount) || (turnIn && int32(ownedCount) >= pProto->MaxCount)) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 821692bff55..7fd73ed4d8d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14570,7 +14570,7 @@ void Unit::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* target) { FactionTemplateEntry const* ft1 = GetFactionTemplateEntry(); FactionTemplateEntry const* ft2 = target->GetFactionTemplateEntry(); - if (ft1 && ft2 && !ft1->IsFriendlyTo(*ft2)) + if (!ft1->IsFriendlyTo(*ft2)) { if (index == UNIT_FIELD_BYTES_2) // Allow targetting opposite faction in party when enabled in config |