diff options
| author | xinef1 <w.szyszko2@gmail.com> | 2017-03-02 00:10:15 +0100 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-03-01 20:10:15 -0300 |
| commit | fb2aebe46be7439a8f9b99067edb27fd844c1a28 (patch) | |
| tree | bd89ba39bf1331ff6784d050bd24204b3cfdfb36 /src/server/game/Reputation | |
| parent | 9b284ab329b55b0c41f47d171573780205a3a81a (diff) | |
Core/Misc: Always reward all necessary reputations on creature kill (#19106)
Diffstat (limited to 'src/server/game/Reputation')
| -rw-r--r-- | src/server/game/Reputation/ReputationMgr.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Reputation/ReputationMgr.h | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index 325c1e9dd36..b0c7538da05 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -285,7 +285,7 @@ void ReputationMgr::Initialize() } } -bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental) +bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental, bool spillOverOnly) { sScriptMgr->OnPlayerReputationChange(_player, factionEntry->ID, standing, incremental); bool res = false; @@ -349,7 +349,10 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi FactionStateList::iterator faction = _factions.find(factionEntry->reputationListID); if (faction != _factions.end()) { - res = SetOneFactionReputation(factionEntry, standing, incremental); + // if we update spillover only, do not update main reputation (rank exceeds creature reward rate) + if (!spillOverOnly) + res = SetOneFactionReputation(factionEntry, standing, incremental); + // only this faction gets reported to client, even if it has no own visible standing SendState(&faction->second); } diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index 8ab83e1e50d..b3e71c3a0a7 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -118,11 +118,11 @@ class TC_GAME_API ReputationMgr public: // modifiers bool SetReputation(FactionEntry const* factionEntry, int32 standing) { - return SetReputation(factionEntry, standing, false); + return SetReputation(factionEntry, standing, false, false); } - bool ModifyReputation(FactionEntry const* factionEntry, int32 standing) + bool ModifyReputation(FactionEntry const* factionEntry, int32 standing, bool spillOverOnly = false) { - return SetReputation(factionEntry, standing, true); + return SetReputation(factionEntry, standing, true, spillOverOnly); } void SetVisible(FactionTemplateEntry const* factionTemplateEntry); @@ -144,7 +144,7 @@ class TC_GAME_API ReputationMgr private: // internal helper functions void Initialize(); uint32 GetDefaultStateFlags(FactionEntry const* factionEntry) const; - bool SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental); + bool SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental, bool spillOverOnly); void SetVisible(FactionState* faction); void SetAtWar(FactionState* faction, bool atWar) const; void SetInactive(FactionState* faction, bool inactive) const; |