*Fix milling.

*Fix Divine Shield.

--HG--
branch : trunk

2 files changed, 14 insertions, 5 deletions

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 2bd842efaed..364d85e2122 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -74,6 +74,7 @@ SpellMgr::SpellMgr()
             case SPELL_EFFECT_DISENCHANT:
             case SPELL_EFFECT_FEED_PET:
             case SPELL_EFFECT_PROSPECTING:
+            case SPELL_EFFECT_MILLING:
                 EffectTargetType[i] = SPELL_REQUIRE_ITEM;
                 break;
             //caster must be pushed otherwise no sound
@@ -529,7 +530,15 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex, bool deep)
         case 34700:                                         // Allergic Reaction
         case 31719:                                         // Suspension
             return false;
-    }  
+    }
+
+    switch(spellproto->Mechanic)
+    {
+        case MECHANIC_SHIELD:
+            return true;
+        default:
+            break;
+    }
 
     switch(spellproto->Effect[effIndex])
     {
diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h
index cb7a45027df..7070e6180c0 100644
--- a/src/shared/Config/Config.h
+++ b/src/shared/Config/Config.h
@@ -34,10 +34,10 @@ class TRINITY_DLL_SPEC Config
 
         bool SetSource(const char *file, bool ignorecase = true);
         bool Reload();
-

-        std::string GetStringDefault(const char * name, std::string def);

-        bool GetBoolDefault(const char * name, const bool def);

-        int32 GetIntDefault(const char * name, const int32 def);

+
+        std::string GetStringDefault(const char * name, std::string def);
+        bool GetBoolDefault(const char * name, const bool def);
+        int32 GetIntDefault(const char * name, const int32 def);
         float GetFloatDefault(const char * name, const float def);
 
         std::string GetFilename() const { return mFilename; }