diff options
| author | ShinDarth <borzifrancesco@gmail.com> | 2015-10-28 18:05:30 +0100 |
|---|---|---|
| committer | ShinDarth <borzifrancesco@gmail.com> | 2015-11-07 21:16:18 +0100 |
| commit | 3b1db7a514c1385aed5e472ef4c498803fae51c1 (patch) | |
| tree | be3ce7614661e56f8b85c44c6c07baf5d9e4f30e /src/server/scripts | |
| parent | b774aedd93a229fd3cbcd17a09ac195a9c0c47c6 (diff) | |
Scripts/DuelReset:
- do not reset when duel is fled
- minor improvement to SpellHistory::RestoreCooldonStateAfter duel method
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/World/duel_reset.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp index 593906074c5..ae98c0eb4ab 100644 --- a/src/server/scripts/World/duel_reset.cpp +++ b/src/server/scripts/World/duel_reset.cpp @@ -66,8 +66,8 @@ class DuelResetScript : public PlayerScript // Called when a duel ends void OnDuelEnd(Player* winner, Player* loser, DuelCompleteType type) override { - // do not reset anything if DUEL_INTERRUPTED - if (type != DUEL_INTERRUPTED) + // do not reset anything if DUEL_INTERRUPTED or DUEL_FLED + if (type == DUEL_WON) { // Cooldown restore if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS)) @@ -96,7 +96,7 @@ class DuelResetScript : public PlayerScript } } } - + void ResetSpellCooldowns(Player* player, bool removeActivePetCooldowns) { // remove cooldowns on spells that have < 10 min CD and has no onHold |