Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to all-reputation and all-skill custom option handling:

Browse Source 
- Move on-create customs (all explored, all reputations) to CharacterHandler::HandlePlayerLogin for first login.

- Add Wrath and cata factions to all reputations custom (it only had BC factions).

- Remove unused ReputationMgr::SendStates. Add ReputationMgr::SendState handling for sending all updated states in arbitrary order if nullptr is passed (used in point 1).

- Fix all weapon skills max custom to properly apply on learning new weapon skills.
This commit is contained in:
treeston
2017-06-15 04:19:12 +02:00
committed by Aokromes
parent 5812c6559f
commit 4cd2ff6ae4
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Handlers/CharacterHandler.cpp
View File

@@ -1053,6 +1053,11 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1105), 42999, false); // The Oracles
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1119), 42999, false); // The Sons of Hodir
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1091), 42999, false); // The Wyrmrest Accord
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1204), 42999, false); // Avengers of Hyjal
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1158), 42999, false); // Guardians of Hyjal
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1173), 42999, false); // Ramkahen
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1171), 42999, false); // Therazane
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1135), 42999, false); // The Earthen Ring
// Factions depending on team, like cities and some more stuff
switch (pCurrChar->GetTeam())
@@ -1071,6 +1076,8 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1126), 42999, false); // The Frostborn
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1094), 42999, false); // The Silver Covenant
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1050), 42999, false); // Valiance Expedition
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1177), 42999, false); // Baradin's Wardens
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1174), 42999, false); // Wildhammer Clan
break;
case HORDE:
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry( 76), 42999, false); // Orgrimmar
@@ -1086,6 +1093,8 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1124), 42999, false); // The Sunreavers
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1064), 42999, false); // The Taunka
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1085), 42999, false); // Warsong Offensive
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1172), 42999, false); // Dragonmaw Clan
repMgr.SetOneFactionReputation(sFactionStore.LookupEntry(1178), 42999, false); // Hellscream's Reach
break;
default:
break;

10
src/server/game/Reputation/ReputationMgr.cpp
View File

@@ -239,17 +239,7 @@ void ReputationMgr::SendInitialReputations()
_player->SendDirectMessage(&data);
}
<<<<<<< HEAD
void ReputationMgr::SendStates()
{
for (FactionStateList::iterator itr = _factions.begin(); itr != _factions.end(); ++itr)
SendState(&(itr->second));
}
void ReputationMgr::SendVisible(FactionState const* faction, bool visible /* = true*/) const
=======
void ReputationMgr::SendVisible(FactionState const* faction) const
>>>>>>> 4b6351e... Fixes to all-reputation and all-skill custom option handling:
{
if (_player->GetSession()->PlayerLoading())
return;