cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bunch of bugs Jorge found. Readded tutorial quests back.

Browse Source
This commit is contained in:
Filip Maj
2022-02-20 21:30:09 -05:00
parent c240096eb8
commit bbbab356af
10 changed files with 104 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Map Server/Actors/Quest/Quest.cs
View File

@@ -123,7 +123,7 @@ namespace Meteor.Map.Actors.QuestNS
public void UpdateENPCs()
{
if (data.Dirty)
if (data != null && data.Dirty)
{
if (questState != null)
questState.UpdateState();
@@ -186,7 +186,7 @@ namespace Meteor.Map.Actors.QuestNS
{
List<LuaParam> returned = LuaEngine.GetInstance().CallLuaFunctionForReturn(caller, this, "IsQuestENPC", true, npc, this);
bool scriptReturned = returned != null && returned.Count != 0 && returned[0].typeID == 3;
return scriptReturned || questState.HasENpc(npc.GetActorClassId());
return scriptReturned || (questState?.HasENpc(npc.GetActorClassId()) ?? false);
}
public void StartSequence(ushort sequence)

2
Map Server/Actors/Quest/QuestStateManager.cs
View File

@@ -72,7 +72,7 @@ namespace Meteor.Map.Actors.QuestNS
public void UpdateQuestCompleted(Quest quest)
{
CompletedQuestsBitfield.Set(quest.Id - SCENARIO_START);
CompletedQuestsBitfield.Set(quest.GetQuestId() - SCENARIO_START);
QuestGameData[] updated = Server.GetQuestGamedataByPrerequisite(quest.GetQuestId());
foreach (var questData in updated)
PrereqBitfield.Set(questData.Id - SCENARIO_START);