diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-10-15 11:15:25 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-10-15 11:15:25 -0500 |
| commit | c757f811f265752f2e4dfe1921ace9d7aaf80983 (patch) | |
| tree | 14b467a51cf38d5e2bc243c78a90102eda6d656f /src/server/game/Handlers/CharacterHandler.cpp | |
| parent | 963aa5a159c5541b6c794b42a5f5809bc7a36192 (diff) | |
| parent | 6f0a8040d8d363064c7d4aa65d3b3d6f40796009 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Commands/cs_modify.cpp
Diffstat (limited to 'src/server/game/Handlers/CharacterHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index a37362ce7bc..77d1c05abf2 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -2122,10 +2122,10 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData) FactionEntry const* factionEntry = sFactionStore.LookupEntry(oldReputation); // old base reputation - int32 oldBaseRep = sObjectMgr->GetBaseReputation(factionEntry, oldRace, playerClass); + int32 oldBaseRep = sObjectMgr->GetBaseReputationOff(factionEntry, oldRace, playerClass); // new base reputation - int32 newBaseRep = sObjectMgr->GetBaseReputation(sFactionStore.LookupEntry(newReputation), race, playerClass); + int32 newBaseRep = sObjectMgr->GetBaseReputationOff(sFactionStore.LookupEntry(newReputation), race, playerClass); // final reputation shouldnt change int32 FinalRep = oldDBRep + oldBaseRep; |
