Merge branch 'master' of github.com:CypherCore/CypherCore

This commit is contained in:
hondacrx
2024-01-31 20:59:17 -05:00
2 changed files with 0 additions and 2 deletions
@@ -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) 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); me.SetFaction((uint)FactionTemplates.Friendly);
EnterEvadeMode(); EnterEvadeMode();
Talk(TextIds.SayDefeat); Talk(TextIds.SayDefeat);
@@ -241,7 +241,6 @@ namespace Scripts.EasternKingdoms.Karazhan
GameObject sideEntrance = instance.GetGameObject(SideEntranceDoor); GameObject sideEntrance = instance.GetGameObject(SideEntranceDoor);
if (sideEntrance != null) if (sideEntrance != null)
sideEntrance.RemoveFlag(GameObjectFlags.Locked); sideEntrance.RemoveFlag(GameObjectFlags.Locked);
UpdateEncounterStateForKilledCreature(16812, null);
} }
break; break;
case DataTypes.Chess: case DataTypes.Chess: