zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-08 05:24:34 +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

25
FFXIVClassic Map Server/PacketProcessor.cs
View file

@ -248,16 +248,11 @@ namespace FFXIVClassic_Map_Server
*/
Actor ownerActor = Server.GetStaticActors(eventStart.scriptOwnerActorID);
if (ownerActor != null && ownerActor is Command)
{
player.GetActor().currentCommand = eventStart.scriptOwnerActorID;
player.GetActor().currentCommandName = eventStart.triggerName;
}
else
{
player.GetActor().currentEventOwner = eventStart.scriptOwnerActorID;
player.GetActor().currentEventName = eventStart.triggerName;
}
player.GetActor().currentEventOwner = eventStart.scriptOwnerActorID;
player.GetActor().currentEventName = eventStart.triggerName;
if (ownerActor == null)
{
@ -275,8 +270,8 @@ namespace FFXIVClassic_Map_Server
}
}
}
LuaEngine.DoActorOnEventStarted(player.GetActor(), ownerActor, eventStart);
player.GetActor().StartEvent(ownerActor, eventStart);
Program.Log.Debug("\n===Event START===\nSource Actor: 0x{0:X}\nCaller Actor: 0x{1:X}\nVal1: 0x{2:X}\nVal2: 0x{3:X}\nEvent Starter: {4}\nParams: {5}", eventStart.actorID, eventStart.scriptOwnerActorID, eventStart.val1, eventStart.val2, eventStart.triggerName, LuaUtils.DumpParams(eventStart.luaParams));
break;
@ -288,7 +283,7 @@ namespace FFXIVClassic_Map_Server
subpacket.DebugPrintSubPacket();
EventUpdatePacket eventUpdate = new EventUpdatePacket(subpacket.data);
Program.Log.Debug("\n===Event UPDATE===\nSource Actor: 0x{0:X}\nCaller Actor: 0x{1:X}\nVal1: 0x{2:X}\nVal2: 0x{3:X}\nStep: 0x{4:X}\nParams: {5}", eventUpdate.actorID, eventUpdate.scriptOwnerActorID, eventUpdate.val1, eventUpdate.val2, eventUpdate.step, LuaUtils.DumpParams(eventUpdate.luaParams));
/*
//Is it a static actor? If not look in the player's instance
Actor updateOwnerActor = Server.GetStaticActors(player.GetActor().currentEventOwner);
if (updateOwnerActor == null)
@ -301,8 +296,10 @@ namespace FFXIVClassic_Map_Server
if (updateOwnerActor == null)
break;
}
*/
player.GetActor().UpdateEvent(eventUpdate);
LuaEngine.DoActorOnEventUpdated(player.GetActor(), updateOwnerActor, eventUpdate);
//LuaEngine.DoActorOnEventUpdated(player.GetActor(), updateOwnerActor, eventUpdate);
break;
case 0x012F: