mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-22 12:47:46 +00:00
Code Activity

More merge fixes!

Browse source
This commit is contained in:
yogurt 2017-07-11 11:52:54 -05:00
parent 4dee26e136
commit 4032258e76
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FFXIVClassic Map Server/actors/chara/npc/Npc.cs
View file

@ -393,7 +393,7 @@ namespace FFXIVClassic_Map_Server.Actors
zone.DespawnActor(this); zone.DespawnActor(this);
} }
public void Update(double deltaTime) public void Update(DateTime tick)
{ {
var deltaTime = (tick - aiContainer.GetLatestUpdate()).Milliseconds; var deltaTime = (tick - aiContainer.GetLatestUpdate()).Milliseconds;
LuaEngine.GetInstance().CallLuaFunction(null, this, "onUpdate", true, deltaTime); LuaEngine.GetInstance().CallLuaFunction(null, this, "onUpdate", true, deltaTime);

3
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -1431,6 +1431,7 @@ namespace FFXIVClassic_Map_Server.Actors
ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("work/guildleve", this); ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("work/guildleve", this);
propPacketUtil.AddProperty(String.Format("work.guildleveDone[{0}]", slot)); propPacketUtil.AddProperty(String.Format("work.guildleveDone[{0}]", slot));
propPacketUtil.AddProperty(String.Format("work.guildleveChecked[{0}]", slot)); propPacketUtil.AddProperty(String.Format("work.guildleveChecked[{0}]", slot));
QueuePackets(propPacketUtil.Done());
} }
public void SetLoginDirector(Director director) public void SetLoginDirector(Director director)
@ -1555,7 +1556,7 @@ namespace FFXIVClassic_Map_Server.Actors
public void EndEvent() public void EndEvent()
{ {
SubPacket p = EndEventPacket.BuildPacket(actorId, currentEventOwner, currentEventName); SubPacket p = EndEventPacket.BuildPacket(actorId, currentEventOwner, currentEventName);
//p.DebugPrintSubPacket(); p.DebugPrintSubPacket();
QueuePacket(p); QueuePacket(p);
currentEventOwner = 0; currentEventOwner = 0;