[8311] Prevent multiline fake messages in chat. Author: horogandris

--HG--
branch : trunk

2 files changed, 8 insertions, 8 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 5acaa58d8a3..58fe17783bc 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -6457,13 +6457,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
         {
             switch(dummySpell->Id)
             {
-               // Shaman T8 Elemental 4P Bonus
-                case 64928:
-                {
-                    basepoints0 = int32( triggerAmount * damage / 100 );
-                    triggered_spell_id = 64930;
-                    break;
-                }
                 // Improved fire nova totem
                 case 16544:
                 {
@@ -6643,6 +6636,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     triggered_spell_id = 58879;
                     break;
                 }
+                // Shaman T8 Elemental 4P Bonus
+                case 64928:
+                {
+                    basepoints0 = int32( triggerAmount * damage / 100 );
+                    triggered_spell_id = 64930;            // Electrified
+                    break;
+                }
             }
             // Storm, Earth and Fire
             if (dummySpell->SpellIconID == 3063)
diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp
index 354568c778f..644769f2069 100644
--- a/src/shared/Util.cpp
+++ b/src/shared/Util.cpp
@@ -131,7 +131,7 @@ Tokens StrSplit(const std::string &src, const std::string &sep)
 
 void stripLineInvisibleChars(std::string &str)
 {
-    static std::string invChars = " \t\7";
+    static std::string invChars = " \t\7\n";
 
     size_t wpos = 0;