diff options
| author | megamage <none@none> | 2009-08-06 17:42:44 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-08-06 17:42:44 -0500 |
| commit | e8556b879d36ad8899d6eb40e98f6de6d420a275 (patch) | |
| tree | 7d37b85d4bbd1790da4ce1bf36de27affa6ea3d8 /src | |
| parent | b35e7ac28d4a48e1a8acf3dfc78c2e6ce031eb51 (diff) | |
[8311] Prevent multiline fake messages in chat. Author: horogandris
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Unit.cpp | 14 | ||||
| -rw-r--r-- | src/shared/Util.cpp | 2 |
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; |