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

Core/DataStores: Fixed db2 structures after 7.3.5

Browse Source
This commit is contained in:
hondacrx
2018-03-13 15:43:03 -04:00
parent 2199e07955
commit 0ab3b8e8cd
97 changed files with 3139 additions and 1707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Scenarios/Scenario.cs
+4 -4
View File
@@ -64,7 +64,7 @@ namespace Game.Scenarios
public virtual void CompleteStep(ScenarioStepRecord step)
{
Quest quest = Global.ObjectMgr.GetQuestTemplate(step.QuestRewardID);
Quest quest = Global.ObjectMgr.GetQuestTemplate(step.RewardQuestID);
if (quest != null)
{
foreach (ObjectGuid guid in _players)
@@ -87,7 +87,7 @@ namespace Game.Scenarios
if (GetStepState(_step) == ScenarioStepState.Done)
continue;
if (newStep == null || _step.Step < newStep.Step)
if (newStep == null || _step.OrderIndex < newStep.OrderIndex)
newStep = _step;
}
@@ -265,7 +265,7 @@ namespace Game.Scenarios
if (scenarioStep.IsBonusObjective())
continue;
if (firstStep == null || scenarioStep.Step < firstStep.Step)
if (firstStep == null || scenarioStep.OrderIndex < firstStep.OrderIndex)
firstStep = scenarioStep;
}
@@ -287,7 +287,7 @@ namespace Game.Scenarios
if (!step.IsBonusObjective())
continue;
if (Global.CriteriaMgr.GetCriteriaTree(step.CriteriaTreeID) != null)
if (Global.CriteriaMgr.GetCriteriaTree(step.CriteriaTreeId) != null)
{
BonusObjectiveData bonusObjectiveData;
bonusObjectiveData.BonusObjectiveID = (int)step.Id;
Source/Game/Scenarios/ScenarioManager.cs
+2 -2
View File
@@ -119,8 +119,8 @@ namespace Game.Scenarios
if (!scenarioSteps.ContainsKey(step.ScenarioID))
scenarioSteps[step.ScenarioID] = new Dictionary<byte, ScenarioStepRecord>();
scenarioSteps[step.ScenarioID][step.Step] = step;
CriteriaTree tree = Global.CriteriaMgr.GetCriteriaTree(step.CriteriaTreeID);
scenarioSteps[step.ScenarioID][step.OrderIndex] = step;
CriteriaTree tree = Global.CriteriaMgr.GetCriteriaTree(step.CriteriaTreeId);
if (tree != null)
{
uint criteriaTreeSize = 0;