diff options
| author | Jeremy <Golrag@users.noreply.github.com> | 2018-03-04 22:32:08 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-03-04 22:32:08 +0100 |
| commit | f411b7a90e4900c9e2df7c1e0c7a301360408cec (patch) | |
| tree | 9793744cf0749d37bb13d6d69355b8672e5f6c34 /src/server/game/Entities/Unit | |
| parent | e0eafc1cac9d840f897f9269e8440aaebfab6a96 (diff) | |
Core/Player: Implement PvP Talents (#19962)
* SPELL_AURA_119 -> SPELL_AURA_PVP_TALENTS
* Learn Honorable Medallion when pvp rules are enabled
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index be1ead476fa..c568480de1e 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7798,7 +7798,11 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) return; if (PvP) + { m_CombatTimer = 5000; + if (Player* me = ToPlayer()) + me->EnablePvpRules(true); + } if (IsInCombat() || HasUnitState(UNIT_STATE_EVADE)) return; |