zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-10 06:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands

Browse source 
# Conflicts:
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
#	data/scripts/global.lua
This commit is contained in:
Tahir Akhlaq 2016-06-24 22:13:17 +01:00
commit 5fc0e0eeca
412 changed files with 2364 additions and 1832 deletions
Download patch file Download diff file Expand all files Collapse all files

27
FFXIVClassic Map Server/lua/LuaEngine.cs
View file

@ -57,14 +57,8 @@ namespace FFXIVClassic_Map_Server.lua
return null;
}
public static void DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart)
{
if (target is Npc)
{
((Npc)target).DoEventStart(player, eventStart);
return;
}
public static Coroutine DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart)
{
string luaPath;
if (target is Command)
@ -83,24 +77,17 @@ namespace FFXIVClassic_Map_Server.lua
LuaScript script = LoadScript(luaPath);
if (script == null)
return;
return null;
//Have to Do this to combine LuaParams
List<Object> objects = new List<Object>();
objects.Add(player);
objects.Add(target);
objects.Add(eventStart.triggerName);
if (eventStart.luaParams != null)
objects.AddRange(LuaUtils.CreateLuaParamObjectList(eventStart.luaParams));
//Run Script
if (!script.Globals.Get("onEventStarted").IsNil())
script.Call(script.Globals["onEventStarted"], objects.ToArray());
return script.CreateCoroutine(script.Globals["onEventStarted"]).Coroutine;
else
return null;
}
else
{
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
return null;
}
}