From 879553ddf83085031641b19102e9cd97a3e334e8 Mon Sep 17 00:00:00 2001 From: Barbz Date: Tue, 23 Oct 2018 19:39:14 +0200 Subject: [PATCH] Core/Conf: Fix StartAllReputation from player.cpp (#973) Remove StartAllReputation from player.cpp Move StartAllReputation to handler Add the config back --- src/server/game/Entities/Player/Player.cpp | 43 ------------------ src/server/game/Handlers/CharacterHandler.cpp | 44 +++++++++++++++++++ 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index effe1795d..efd339b97 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1097,49 +1097,6 @@ bool Player::Create(uint32 guidlow, CharacterCreateInfo* createInfo) SetFlag(PLAYER_EXPLORED_ZONES_1+i, 0xFFFFFFFF); } - //Reputations if "StartAllReputation" is enabled, -- TODO: Fix this in a better way - if (sWorld->getBoolConfig(CONFIG_START_ALL_REP)) - { - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(942), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(935), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(936), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1011), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(970), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(967), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(989), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(932), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(934), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1038), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1077), 42999); - - // Factions depending on team, like cities and some more stuff - switch (GetTeamId(true)) - { - case TEAM_ALLIANCE: - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(72), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(47), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(69), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(930), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(730), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(978), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(54), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(946), 42999); - break; - case TEAM_HORDE: - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(76), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(68), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(81), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(911), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(729), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(941), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(530), 42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(947), 42999); - break; - default: - break; - } - } - // Played time m_Last_tick = time(NULL); m_Played_time[PLAYED_TIME_TOTAL] = 0; diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 0c7d0d37e..284a8eb78 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1099,6 +1099,50 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder* holder) pCurrChar->CheckAllAchievementCriteria(); } + // Reputations if "StartAllReputation" is enabled, -- TODO: Fix this in a better way + if (sWorld->getBoolConfig(CONFIG_START_ALL_REP)) + { + ReputationMgr& repMgr = pCurrChar->GetReputationMgr(); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(942), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(935), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(936), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1011), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(970), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(967), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(989), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(932), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(934), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1038), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1077), 42999, false); + + switch (pCurrChar->getFaction()) + { + case ALLIANCE: + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(72), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(47), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(69), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(930), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(730), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(978), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(54), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(946), 42999, false); + break; + case HORDE: + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(76), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(68), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(81), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(911), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(729), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(941), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(530), 42999, false); + repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(947), 42999, false); + break; + default: + break; + } + repMgr.SendStates(); + } + // show time before shutdown if shutdown planned. if (sWorld->IsShuttingDown()) sWorld->ShutdownMsg(true, pCurrChar);