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

Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4

Browse Source 
Conflicts:
	README.md
	sql/updates/world/2015_02_06_13_world_335.sql
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Carbenium
2015-07-21 21:45:04 +02:00
parent 9fca7b8017 b69fd4ac68
commit 7d5d040948
25 changed files with 467 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,7 +298,7 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
{
// bonuses are already given, so just modify standing by rate
int32 spilloverRep = int32(standing * repTemplate->faction_rate[i]);
SetOneFactionReputation(sFactionStore.LookupEntry(repTemplate->faction[i]), spilloverRep, incremental);
SetOneFactionReputation(sFactionStore.AssertEntry(repTemplate->faction[i]), spilloverRep, incremental);
}
}
}