[svn] * Updated to 6743 and 685

Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders

--HG--
branch : trunk
rename : 6731-680 => 6743-685

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 3be0b6989b2..ba5b5d97b47 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -986,7 +986,7 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask)
 

                 if( !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_NO_INITIAL_AGGRO) )

                 {

-                    if(!unit->IsStandState() && !unit->hasUnitState(UNIT_STAT_STUNDED))

+                    if(!unit->IsStandState() && !unit->hasUnitState(UNIT_STAT_STUNNED))

                         unit->SetStandState(PLAYER_STATE_NONE);

 

                     if(!unit->isInCombat() && unit->GetTypeId() != TYPEID_PLAYER && ((Creature*)unit)->AI())

@@ -2407,7 +2407,7 @@ void Spell::update(uint32 difftime)
                         cancel();

 

                     // check for incapacitating player states

-                    if( m_caster->hasUnitState(UNIT_STAT_STUNDED | UNIT_STAT_CONFUSED))

+                    if( m_caster->hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_CONFUSED))

                         cancel();

 

                     // check if player has turned if flag is set