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

16
FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
View file

@ -47,7 +47,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
break;
}
}
public bool IsClientConnectionsReady()
{
return (zoneConnection != null && chatConnection != null);
@ -57,7 +57,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
{
zoneConnection.Disconnect();
chatConnection.Disconnect();
}
}
public bool IsDisconnected()
{
@ -110,11 +110,11 @@ namespace FFXIVClassic_Map_Server.dataobjects
playerActor.moveState = moveState;
GetActor().zone.UpdateActorPosition(GetActor());
}
}
public void UpdateInstance(List<Actor> list)
{
{
List<BasePacket> basePackets = new List<BasePacket>();
List<SubPacket> RemoveActorSubpackets = new List<SubPacket>();
List<SubPacket> posUpdateSubpackets = new List<SubPacket>();
@ -125,7 +125,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
if (!list.Contains(actorInstanceList[i]))
{
GetActor().QueuePacket(RemoveActorPacket.BuildPacket(playerActor.actorId, actorInstanceList[i].actorId));
actorInstanceList.RemoveAt(i);
actorInstanceList.RemoveAt(i);
}
}
@ -145,7 +145,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
{
GetActor().QueuePacket(actor.GetSpawnPackets(playerActor.actorId, 1));
GetActor().QueuePacket(actor.GetInitPackets(playerActor.actorId));
GetActor().QueuePacket(actor.GetSetEventStatusPackets(playerActor.actorId));
GetActor().QueuePacket(actor.GetSetEventStatusPackets(playerActor.actorId));
actorInstanceList.Add(actor);
if (actor is Npc)