From c21c24d461637aee1cadffd4cf5d5c87fe77747e Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Thu, 24 Jun 2010 15:05:55 +0200
Subject: Fix Ice barrier scaling, Fire Ward & Frost Ward, by dr.te...

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 1b485e416e4..9358365c17d 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -482,8 +482,24 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
                     // Ice Barrier
                     if (GetSpellProto()->SpellFamilyFlags[1] & 0x1 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
                     {
-                        // +80.67% from sp bonus
-                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8067f;
+                        // +80.68% from sp bonus
+                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
+                        // Glyph of Ice Barrier: its weird having a SPELLMOD_ALL_EFFECTS here but its blizzards doing :)
+                        // Glyph of Ice Barrier is only applied at the spell damage bonus because it was already applied to the base value in CalculateSpellDamage
+                        if (Player* modOwner = caster->GetSpellModOwner())
+                            modOwner->ApplySpellMod(GetSpellProto()->Id, SPELLMOD_ALL_EFFECTS, DoneActualBenefit);
+                    }
+                    // Fire Ward
+                    else if(GetSpellProto()->SpellFamilyFlags[0] & 0x8 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
+                    {
+                        // +80.68% from sp bonus
+                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
+                    }
+                    // Frost Ward
+                    else if(GetSpellProto()->SpellFamilyFlags[0] & 0x100 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
+                    {
+                        // +80.68% from sp bonus
+                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
                     }
                     break;
                 case SPELLFAMILY_WARLOCK:
-- 
cgit v1.2.3


From 55ca26294a51a3f34373764e77c23c0a7a134793 Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Thu, 24 Jun 2010 15:12:01 +0200
Subject: Fixed Shadow Ward coefficient, by dr.te...

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 9358365c17d..f5d2ad75f93 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -504,10 +504,10 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
                     break;
                 case SPELLFAMILY_WARLOCK:
                     // Shadow Ward
-                    if (m_spellProto->SpellFamilyFlags[2]& 0x40)
+                    if (m_spellProto->SpellFamilyFlags[2] & 0x40)
                     {
-                        // +30% from sp bonus
-                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.3f;
+                        // +80.68% from sp bonus
+                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
                     }
                     break;
                 case SPELLFAMILY_PRIEST:
-- 
cgit v1.2.3


From 38fa3c212b9d6eac2c9747be1b0015f978de7b8b Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Thu, 24 Jun 2010 15:32:11 +0200
Subject: Fix primal tenacity reduce damage while stunned only on cat form, by
 laise Closes issue #1143

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 76b87985dec..0ee16010393 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -1791,7 +1791,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
                 if (spellProto->SpellIconID == 2253)
                 {
                     //reduces all damage taken while Stunned
-                    if (unitflag & UNIT_FLAG_STUNNED)
+                    if (pVictim->m_form == FORM_CAT && (unitflag & UNIT_FLAG_STUNNED))
                         RemainingDamage -= RemainingDamage * currentAbsorb / 100;
                     continue;
                 }
-- 
cgit v1.2.3


From e0507a4a8d2b6c8dda9d283997d623f56b9a68b7 Mon Sep 17 00:00:00 2001
From: Tartalo <none@none>
Date: Thu, 24 Jun 2010 15:48:17 +0200
Subject: Fix logic on namego Now is possible to namego to a player inside an
 arena, by filip.havlicked Closes issue #2130

--HG--
branch : trunk
---
 src/server/game/Chat/Commands/Level1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp
index d80157611fb..a9f1e7d9c15 100644
--- a/src/server/game/Chat/Commands/Level1.cpp
+++ b/src/server/game/Chat/Commands/Level1.cpp
@@ -817,7 +817,7 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
         if (pMap->IsBattleGroundOrArena())
         {
             // only allow if gm mode is on
-            if (!target->isGameMaster())
+            if (!_player->isGameMaster())
             {
                 PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM,nameLink.c_str());
                 SetSentErrorMessage(true);
-- 
cgit v1.2.3