From 25cd75d40cfcbdea76ac5c6b1405c9a47c2ebd50 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sat, 24 Jun 2017 15:57:46 -0400 Subject: [PATCH] Added way to instantiate a GL Director. Aetheryte parent now does it. --- FFXIVClassic Map Server/actors/area/Area.cs | 11 +++++++++++ .../chara/npc/object/aetheryte/AetheryteParent.lua | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/FFXIVClassic Map Server/actors/area/Area.cs b/FFXIVClassic Map Server/actors/area/Area.cs index 3478057b..fec0e1c6 100644 --- a/FFXIVClassic Map Server/actors/area/Area.cs +++ b/FFXIVClassic Map Server/actors/area/Area.cs @@ -501,6 +501,17 @@ namespace FFXIVClassic_Map_Server.Actors } } + public Director CreateGuildleveDirector(string path, uint glid, params object[] args) + { + lock (directorLock) + { + GuildleveDirector director = new GuildleveDirector(directorIdCount, this, path, glid, args); + currentDirectors.Add(directorIdCount, director); + directorIdCount++; + return director; + } + } + public void DeleteDirector(uint id) { lock (directorLock) diff --git a/data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua b/data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua index edc8268b..c934ca9f 100644 --- a/data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua +++ b/data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua @@ -120,7 +120,7 @@ function doLevequestInit(player, aetheryte) if (difficulty == nil) then goto SELECT_DETAIL; end confirmResult = callClientFunction(player, "eventGLStart", glId, difficulty, 1, guildleveData.favorCount, 20, 0, 0, 0, 0); if (confirmResult == nil) then goto SELECT_DIFFICULTY; else - director = player:GetZone():CreateDirector("Guildleve/PrivateGLBattleDetectNormal"); + director = player:GetZone():CreateGuildleveDirector("Guildleve/PrivateGLBattleDetectNormal", glId); player:AddDirector(director); director:StartDirector(true, glId) end