araxiaonline/AscEmu
3
0
Fork 0
mirror of https://github.com/araxiaonline/AscEmu.git synced 2026-06-13 03:02:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Missing changes for Cata

Browse Source
This commit is contained in:
Zyres
2023-07-24 10:52:54 +02:00
parent 0f8f3a9bca
commit 09567e8201
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/world/Management/ObjectMgr.hpp
View File

@@ -272,7 +272,6 @@ public:
void loadCompletedAchievements();
AchievementReward const* getAchievementReward(uint32_t _entry, uint8_t _gender);
AchievementCriteriaEntryList const& getAchievementCriteriaByType(AchievementCriteriaTypes _type);
void addCompletedAchievement(uint32_t _achievementId);
@@ -280,9 +279,7 @@ public:
private:
AchievementRewardsMap m_achievementRewards;
AchievementCriteriaEntryList m_AchievementCriteriasByType[ACHIEVEMENT_CRITERIA_TYPE_TOTAL];
#if VERSION_STRING > WotLK
AchievementCriteriaEntryList m_GuildAchievementCriteriasByType[ACHIEVEMENT_CRITERIA_TYPE_TOTAL];
#endif
@@ -427,7 +424,6 @@ public:
uint64_t generateVoidStorageItemId();
#endif
private:
std::unordered_map<uint32_t, std::shared_ptr<std::vector<TrainerSpell>>> m_trainerSpellSet;
std::unordered_map<uint32_t, std::shared_ptr<Trainer>> m_trainers;
@@ -444,23 +440,22 @@ private:
std::map<uint32_t, uint32_t> m_petSpellCooldowns;
protected:
std::atomic<unsigned long> m_hiItemGuid = 0;
std::atomic<unsigned long> m_hiGroupId = 0;
std::atomic<unsigned long> m_hiCharterId = 0;
std::atomic<unsigned long> m_hiCreatureSpawnId;
std::atomic<unsigned long> m_hiGameObjectSpawnId;
std::atomic<unsigned long> m_mailId = 0;
std::atomic<unsigned long> m_reportId = 0;
std::atomic<unsigned long> m_setGuid = 0;
std::atomic<unsigned long> m_hiCorpseGuid = 0;
std::atomic<unsigned long> m_hiGuildId = 0;
std::atomic<unsigned long> m_hiPetGuid = 0;
std::atomic<unsigned long> m_hiArenaTeamId = 0;
std::atomic<unsigned long> m_hiPlayerGuid = 1;
std::atomic<unsigned long> m_hiItemGuid = 0;
std::atomic<unsigned long> m_hiGroupId = 0;
std::atomic<unsigned long> m_hiCharterId = 0;
std::atomic<unsigned long> m_hiCreatureSpawnId;
std::atomic<unsigned long> m_hiGameObjectSpawnId;
std::atomic<unsigned long> m_mailId = 0;
std::atomic<unsigned long> m_reportId = 0;
std::atomic<unsigned long> m_setGuid = 0;
std::atomic<unsigned long> m_hiCorpseGuid = 0;
std::atomic<unsigned long> m_hiGuildId = 0;
std::atomic<unsigned long> m_hiPetGuid = 0;
std::atomic<unsigned long> m_hiArenaTeamId = 0;
std::atomic<unsigned long> m_hiPlayerGuid = 1;
#if VERSION_STRING > WotLK
std::atomic<unsigned long> m_voidItemId = 1;
std::atomic<unsigned long> m_voidItemId = 1;
#endif
};
#define sObjectMgr ObjectMgr::getInstance()

4
src/world/Server/Packets/Handlers/NPCHandler.cpp
View File

@@ -498,8 +498,8 @@ void WorldSession::sendTrainerList(Creature* creature)
}
#if VERSION_STRING >= Cata
data << uint32_t(trainerSpell->isPrimaryProfession && _player->getFreePrimaryProfessionPoints() != 0);
data << uint32_t(trainerSpell->isPrimaryProfession);
data << uint32_t(trainerSpell.isPrimaryProfession && _player->getFreePrimaryProfessionPoints() != 0);
data << uint32_t(trainerSpell.isPrimaryProfession);
#endif
++count;
}