From ad8638742cede5e3d34c8ac8c55b7b7534864819 Mon Sep 17 00:00:00 2001
From: Shauren <none@none>
Date: Sun, 13 Jun 2010 15:55:30 +0200
Subject: Do not apply duration spellmods to spells with infinite duration
 (fixes Glyph of Eternal Water + Enduring Winter making water elemental last
 5,10,15 seconds)

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index faeb676c21a..56068408c9f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -18811,6 +18811,10 @@ bool Player::IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mo
     if (spell && mod->charges == -1 && spell->m_appliedMods.find(mod->ownerAura) == spell->m_appliedMods.end())
         return false;
 
+    // +duration to infinite duration spells making them limited
+    if (mod->op == SPELLMOD_DURATION && GetSpellDuration(spellInfo) == -1)
+        return false;
+
     return spellmgr.IsAffectedByMod(spellInfo, mod);
 }
 
-- 
cgit v1.2.3