Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messed up the commit history, so here is all the files rip, Credit to TrinityCore

Browse Source
This commit is contained in:
hondacrx
2023-09-16 08:42:35 -04:00
parent 87284bbded
commit f636ea225f
373 changed files with 158910 additions and 2170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/Instances/InstanceScript.cs
+3 -3
View File
@@ -366,14 +366,14 @@ namespace Game.Maps
InitializeCombatResurrections(1, resInterval);
SendEncounterStart(1, 9, resInterval, resInterval);
instance.DoOnPlayers(player => player.AtStartOfEncounter());
instance.DoOnPlayers(player => player.AtStartOfEncounter(EncounterType.DungeonEncounter));
break;
}
case EncounterState.Fail:
ResetCombatResurrections();
SendEncounterEnd();
instance.DoOnPlayers(player => player.AtEndOfEncounter());
instance.DoOnPlayers(player => player.AtEndOfEncounter(EncounterType.DungeonEncounter));
break;
case EncounterState.Done:
ResetCombatResurrections();
@@ -385,7 +385,7 @@ namespace Game.Maps
SendBossKillCredit(dungeonEncounter.Id);
}
instance.DoOnPlayers(player => player.AtEndOfEncounter());
instance.DoOnPlayers(player => player.AtEndOfEncounter(EncounterType.DungeonEncounter));
break;
default:
break;
Source/Game/Maps/ObjectGridLoader.cs
+1 -1
View File
@@ -120,7 +120,7 @@ namespace Game.Maps
public override void Visit(IList<AreaTrigger> objs)
{
CellCoord cellCoord = i_cell.GetCellCoord();
SortedSet<ulong> areaTriggers = Global.AreaTriggerDataStorage.GetAreaTriggersForMapAndCell(i_map.GetId(), cellCoord.GetId());
SortedSet<ulong> areaTriggers = Global.AreaTriggerDataStorage.GetAreaTriggersForMapAndCell(i_map.GetId(), i_map.GetDifficultyID(), cellCoord.GetId());
if (areaTriggers == null)
return;