Scripts/VioletHold: Fix crash

jackpoz · jackpoz · commit 09aed2565966 · 2015-05-03T11:57:04.000+02:00
Fix crash in Violet Hold happening when crystals were activated without killing trash mobs. Crash added in cba6515 and f4531c5 . Closes #14629
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -794,9 +794,11 @@ class instance_violet_hold : public InstanceMapScript
             trigger->CastSpell(trigger, spellInfoLightning, true, 0, 0, trigger->GetGUID());
 
             // Kill all mobs registered with SetGuidData(ADD_TRASH_MOB)
-            for (GuidSet::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
+            for (GuidSet::const_iterator itr = trashMobs.begin(); itr != trashMobs.end();)
             {
                 Creature* creature = instance->GetCreature(*itr);
+                // Increment the iterator before killing the creature because the kill will remove itr from trashMobs
+                ++itr;
                 if (creature && creature->IsAlive())
                     trigger->Kill(creature);
             }

Original file line number	Diff line number	Diff line change
`@@ -794,9 +794,11 @@ class instance_violet_hold : public InstanceMapScript`
`794`	`794`	`trigger->CastSpell(trigger, spellInfoLightning, true, 0, 0, trigger->GetGUID());`
`795`	`795`
`796`	`796`	`// Kill all mobs registered with SetGuidData(ADD_TRASH_MOB)`
`797`		`- for (GuidSet::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)`
	`797`	`+ for (GuidSet::const_iterator itr = trashMobs.begin(); itr != trashMobs.end();)`
`798`	`798`	`{`
`799`	`799`	`Creature* creature = instance->GetCreature(*itr);`
	`800`	`+ // Increment the iterator before killing the creature because the kill will remove itr from trashMobs`
	`801`	`+ ++itr;`
`800`	`802`	`if (creature && creature->IsAlive())`
`801`	`803`	`trigger->Kill(creature);`
`802`	`804`	`}`