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 'actor_instancing' into develop

Browse source 
# Conflicts:
#	sql/gamedata_actor_class.sql
This commit is contained in:
Filip Maj 2016-06-12 18:52:30 -04:00
commit a4ea5f024b
16 changed files with 9132 additions and 8135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,6 +62,12 @@ namespace FFXIVClassic_Map_Server.lua
public static void doActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart)
{
if (target is Npc)
{
((Npc)target).DoEventStart(player, eventStart);
return;
}
string luaPath;
if (target is Command)
@ -126,6 +132,12 @@ namespace FFXIVClassic_Map_Server.lua
public static void doActorOnEventUpdated(Player player, Actor target, EventUpdatePacket eventUpdate)
{
if (target is Npc)
{
((Npc)target).DoEventUpdate(player, eventUpdate);
return;
}
string luaPath;
if (target is Command)
@ -206,7 +218,7 @@ namespace FFXIVClassic_Map_Server.lua
}
}
private static Script loadScript(string filename)
public static Script loadScript(string filename)
{
Script script = new Script();
((FileSystemScriptLoader)script.Options.ScriptLoader).ModulePaths = FileSystemScriptLoader.UnpackStringPaths("./scripts/?;./scripts/?.lua");
@ -227,7 +239,7 @@ namespace FFXIVClassic_Map_Server.lua
return script;
}
private static void SendError(Player player, string message)
public static void SendError(Player player, string message)
{
List<SubPacket> sendError = new List<SubPacket>();
sendError.Add(EndEventPacket.buildPacket(player.actorId, player.currentEventOwner, player.currentEventName));