Skip to content

Commit

Permalink
Scripts/VioletHold: fix a crash during Ichoron encounter
Browse files Browse the repository at this point in the history
Closes #14962
  • Loading branch information
mik1893 committed Jun 27, 2015
1 parent accab54 commit 7c01638
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
Expand Up @@ -456,6 +456,7 @@ class npc_ichor_globule : public CreatureScript
Initialize();
events.Reset();
DoCast(SPELL_WATER_GLOBULE);
me->SetReactState(REACT_PASSIVE);
}

void SetData(uint32 id, uint32 data) override
Expand All @@ -475,11 +476,11 @@ class npc_ichor_globule : public CreatureScript
switch (id)
{
case 0:
me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->Clear();
events.ScheduleEvent(EVENT_GLOBULE_MOVE, 500);
break;
case 1:
me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->Clear();
if (Creature* ichoron = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ICHORON)))
me->GetMotionMaster()->MoveFollow(ichoron, 0.0f, 0.0f);
break;
Expand Down

4 comments on commit 7c01638

@jackpoz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VioletHold fixes will keep us company for the whole summer :)

@jackpoz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joschiwald
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/joschiwald/TrinityCore/commits/vh i'm merging my stuff that i've done long time ago

@ccrs
Copy link
Member

@ccrs ccrs commented on 7c01638 Jun 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:D

Please sign in to comment.