[10400] Fixed crash in .aura command for spell without auras.

sql/mangos.sql

@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
   `cache_id` int(10) default '0',
-  `required_10381_01_mangos_creature_model_race` bit(1) default NULL
+  `required_10400_01_mangos_mangos_string` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -3797,6 +3797,7 @@ INSERT INTO `mangos_string` VALUES
 (1162,' [counter]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1163,'Achievement %u doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1164,'Achievement criteria %u doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1165,'Spell %u not have auras.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1200,'You try to view cinemitic %u but it doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1201,'You try to view movie %u but it doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `mangos_string` ENABLE KEYS */;

sql/updates/10400_01_mangos_mangos_string.sql

@@ -0,0 +1,6 @@
+ALTER TABLE db_version CHANGE COLUMN required_10381_01_mangos_creature_model_race required_10400_01_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry IN (1165);
+
+INSERT INTO mangos_string VALUES
+(1165,'Spell %u not have auras.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

sql/updates/Makefile.am

@@ -83,6 +83,7 @@ pkgdata_DATA = \
 	10362_01_mangos_creature_movement_template.sql \
 	10365_01_mangos_creature_ai_scripts.sql \
 	10381_01_mangos_creature_model_race.sql \
+	10400_01_mangos_mangos_string.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -146,4 +147,5 @@ EXTRA_DIST = \
 	10362_01_mangos_creature_movement_template.sql \
 	10365_01_mangos_creature_ai_scripts.sql \
 	10381_01_mangos_creature_model_race.sql \
+	10400_01_mangos_mangos_string.sql \
 	README

src/game/Language.h

@@ -884,7 +884,8 @@ enum MangosStrings
     LANG_COUNTER                        = 1162,
     LANG_ACHIEVEMENT_NOT_EXIST          = 1163,
     LANG_ACHIEVEMENT_CRITERIA_NOT_EXIST = 1164,
-    // Room for more level 3              1165-1199 not used
+    LANG_SPELL_NO_HAVE_AURAS            = 1165,
+    // Room for more level 3              1166-1199 not used
 
     // Debug commands
     LANG_CINEMATIC_NOT_EXIST            = 1200,

src/game/Level3.cpp

@@ -3811,28 +3811,35 @@ bool ChatHandler::HandleAuraCommand(char* args)
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spellID = ExtractSpellIdFromLink(&args);
 
-    if (SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID))
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID);
-    {
+    if (!spellInfo)
-        SpellAuraHolder *holder = NULL;
+        return false;
-        if (IsSpellAppliesAura(spellInfo, (1 << EFFECT_INDEX_0) | (1 << EFFECT_INDEX_1) | (1 << EFFECT_INDEX_2)) || IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA))
-            holder = CreateSpellAuraHolder(spellInfo, target, m_session->GetPlayer());
 
-        for(uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    if (!IsSpellAppliesAura(spellInfo, (1 << EFFECT_INDEX_0) | (1 << EFFECT_INDEX_1) | (1 << EFFECT_INDEX_2)) &&
-        {
+        !IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA))
-            uint8 eff = spellInfo->Effect[i];
+    {
-            if (eff>=TOTAL_SPELL_EFFECTS)
+        PSendSysMessage(LANG_SPELL_NO_HAVE_AURAS, spellID);
-                continue;
+        SetSentErrorMessage(true);
-            if (IsAreaAuraEffect(eff)           ||
+        return false;
-                eff == SPELL_EFFECT_APPLY_AURA  ||
-                eff == SPELL_EFFECT_PERSISTENT_AREA_AURA)
-            {
-                Aura *aur = CreateAura(spellInfo, SpellEffectIndex(i), NULL, holder, target);
-                holder->AddAura(aur, SpellEffectIndex(i));
-            }
-        }
-        target->AddSpellAuraHolder(holder);
     }
 
+    SpellAuraHolder *holder = CreateSpellAuraHolder(spellInfo, target, m_session->GetPlayer());
+
+    for(uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        uint8 eff = spellInfo->Effect[i];
+        if (eff>=TOTAL_SPELL_EFFECTS)
+            continue;
+        if (IsAreaAuraEffect(eff)           ||
+            eff == SPELL_EFFECT_APPLY_AURA  ||
+            eff == SPELL_EFFECT_PERSISTENT_AREA_AURA)
+        {
+            Aura *aur = CreateAura(spellInfo, SpellEffectIndex(i), NULL, holder, target);
+            holder->AddAura(aur, SpellEffectIndex(i));
+        }
+    }
+    target->AddSpellAuraHolder(holder);
+
     return true;
 }
 

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10399"
+ #define REVISION_NR "10400"
 #endif // __REVISION_NR_H__

src/shared/revision_sql.h

@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_10332_02_characters_pet_aura"
- #define REVISION_DB_MANGOS "required_10381_01_mangos_creature_model_race"
+ #define REVISION_DB_MANGOS "required_10400_01_mangos_mangos_string"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__