Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.h src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
This commit is contained in:
commit
1c3715f95a
143 files changed
+501
-1901
No files matched your search
@@ -2415,7 +2415,7 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader
|
||||
|
||||
// Set rep to baserep + basepoints (expecting spillover for oposite faction -> become hated)
|
||||
// Not when player already has equal or higher rep with this faction
|
||||
if (player->GetReputationMgr().GetReputation(factionEntry) <= repChange)
|
||||
if (player->GetReputationMgr().GetReputation(factionEntry) < repChange)
|
||||
player->GetReputationMgr().SetReputation(factionEntry, repChange);
|
||||
|
||||
// EFFECT_INDEX_2 most likely update at war state, we already handle this in SetReputation
|
||||
|
||||
Reference in new issue
Block a user