Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DataStores: Fixed db2 structures after 7.3.5

Browse Source
This commit is contained in:
Shauren
2018-03-12 18:20:26 +01:00
parent 50a912af72
commit 007b5a68c5
80 changed files with 4402 additions and 2946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,9 +296,9 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
// check for sub-factions that receive spillover
std::vector<uint32> const* flist = sDB2Manager.GetFactionTeamList(factionEntry->ID);
// if has no sub-factions, check for factions with same parent
if (!flist && factionEntry->ParentFactionID && factionEntry->ParentFactionModOut != 0.0f)
if (!flist && factionEntry->ParentFactionID && factionEntry->ParentFactionMod[1] != 0.0f)
{
spillOverRepOut *= factionEntry->ParentFactionModOut;
spillOverRepOut *= factionEntry->ParentFactionMod[1];
if (FactionEntry const* parent = sFactionStore.LookupEntry(factionEntry->ParentFactionID))
{
FactionStateList::iterator parentState = _factions.find(parent->ReputationIndex);
@@ -320,9 +320,9 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
{
if (FactionEntry const* factionEntryCalc = sFactionStore.LookupEntry(*itr))
{
if (factionEntryCalc == factionEntry || GetRank(factionEntryCalc) > ReputationRank(factionEntryCalc->ParentFactionCapIn))
if (factionEntryCalc == factionEntry || GetRank(factionEntryCalc) > ReputationRank(factionEntryCalc->ParentFactionCap[0]))
continue;
int32 spilloverRep = int32(spillOverRepOut * factionEntryCalc->ParentFactionModIn);
int32 spilloverRep = int32(spillOverRepOut * factionEntryCalc->ParentFactionMod[0]);
if (spilloverRep != 0 || !incremental)
res = SetOneFactionReputation(factionEntryCalc, spilloverRep, incremental);
}