Merge branch 'master' of github.com:CypherCore/CypherCore
This commit is contained in:
@@ -86,7 +86,6 @@ namespace Scripts.EasternKingdoms.BlackrockMountain.MoltenCore.Majordomo
|
||||
|
||||
if (me.FindNearestCreature(MCCreatureIds.FlamewakerHealer, 100.0f) == null && me.FindNearestCreature(MCCreatureIds.FlamewakerElite, 100.0f) == null)
|
||||
{
|
||||
instance.UpdateEncounterStateForKilledCreature(me.GetEntry(), me);
|
||||
me.SetFaction((uint)FactionTemplates.Friendly);
|
||||
EnterEvadeMode();
|
||||
Talk(TextIds.SayDefeat);
|
||||
|
||||
@@ -241,7 +241,6 @@ namespace Scripts.EasternKingdoms.Karazhan
|
||||
GameObject sideEntrance = instance.GetGameObject(SideEntranceDoor);
|
||||
if (sideEntrance != null)
|
||||
sideEntrance.RemoveFlag(GameObjectFlags.Locked);
|
||||
UpdateEncounterStateForKilledCreature(16812, null);
|
||||
}
|
||||
break;
|
||||
case DataTypes.Chess:
|
||||
|
||||
Reference in New Issue
Block a user