diff options
| -rw-r--r-- | src/server/game/Entities/Item/Item.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Quests/QuestDef.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index efe78557e9e..da124487cc7 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -333,7 +333,7 @@ bool Item::Create(ObjectGuid::LowType guidlow, uint32 itemid, Player const* owne continue; if (PlayerConditionEntry const* playerCondition = sPlayerConditionStore.LookupEntry(artifactAppearance->PlayerConditionID)) - if (!sConditionMgr->IsPlayerMeetingCondition(owner, playerCondition)) + if (!owner || !sConditionMgr->IsPlayerMeetingCondition(owner, playerCondition)) continue; SetModifier(ITEM_MODIFIER_ARTIFACT_APPEARANCE_ID, artifactAppearance->ID); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 053b1e2bd09..24b2111796d 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -975,7 +975,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* lootedObject) if (i->freeforall) continue; - item = sObjectMgr->GetItemTemplate(i->itemid); + item = ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(i->itemid)); //roll for over-threshold item if it's one-player loot if (item->GetQuality() >= uint32(m_lootThreshold)) diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index a395d7de297..a96bfc423f7 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -229,7 +229,7 @@ uint32 Quest::XPValue(uint32 playerLevel) const { uint32 questLevel = uint32(Level == -1 ? playerLevel : Level); QuestXPEntry const* questXp = sQuestXPStore.LookupEntry(questLevel); - if (!questXp || RewardXPDifficulty > 10) + if (!questXp || RewardXPDifficulty >= 10) return 0; float multiplier = 1.0f; |