Fix comment commit in r 139a9533256e0312e06fb72cb30622545629f161

gistfile1.diff

@@ -55,30 +55,18 @@ class boss_amanitar : public CreatureScript
 public:
     boss_amanitar() : CreatureScript("boss_amanitar") { }
 
     struct boss_amanitarAI : public BossAI
     {
-        boss_amanitarAI(Creature* creature) : BossAI(creature, DATA_AMANITAR)
-        {
-            instance = creature->GetInstanceScript();
-        }
+        boss_amanitarAI(Creature* creature) : BossAI(creature, DATA_AMANITAR) { }
         
-        InstanceScript* instance;
-        EventMap events;
-
         void Reset()
         {
-            events.Reset();
-            events.ScheduleEvent(EVENT_ROOT, urand(5,9)*IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_BASH, urand(10,14)*IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_BOLT, urand(15,20)*IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_MINI, urand(12,18)*IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_SPAWN, 5 *IN_MILLISECONDS);
-
-            me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE);
-            me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
+            _Reset();
             
+            me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE);
+            me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);            
             summons.DespawnAll();
 
             if (instance)
             {
                 instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
@@ -88,21 +76,30 @@ public:
 
         void JustDied(Unit* /*Killer*/)
         {
             if (instance)
             {
+                _JustDied();
                 instance->SetData(DATA_AMANITAR_EVENT, DONE);
                 instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
                 summons.DespawnAll();
             }
         }
 
         void EnterCombat(Unit* /*who*/)
         {
+            _EnterCombat();
+
+            events.ScheduleEvent(EVENT_ROOT, urand(5,9)*IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_BASH, urand(10,14)*IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_BOLT, urand(15,20)*IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_MINI, urand(12,18)*IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_SPAWN, 5 *IN_MILLISECONDS);
+
             me->SetInCombatWithZone();
             if (instance)
-                instance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS);
+                instance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS);            
         }
 
         void SpawnAdds()
         {
             uint8 u = 0;
@@ -238,11 +235,10 @@ public:
                         break;
                     default:
                         break;
                 }
             }
-            DoMeleeAttackIfReady();
         }
     };
 
     CreatureAI* GetAI(Creature* creature) const
     {