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

Fixed login not working, was due to packets that got queued not flushing. !!!Need to find solution!!! Added a optimization: Actors with 0 battle args are now concidered "static" and will not send their position updates. Removed some debug print statements.

Browse source
This commit is contained in:
Filip Maj 2016-09-24 14:17:31 -04:00
parent d931f71b06
commit 5370f13b2b
8 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
FFXIVClassic Map Server/PacketProcessor.cs
View file

@ -31,12 +31,9 @@ namespace FFXIVClassic_Map_Server
}
public void ProcessPacket(ZoneConnection client, SubPacket subpacket)
{
{
Session session = mServer.GetSession(subpacket.header.targetId);
subpacket.DebugPrintSubPacket();
//Normal Game Opcode
switch (subpacket.gameMessage.opcode)
{
@ -57,6 +54,8 @@ namespace FFXIVClassic_Map_Server
client.QueuePacket(_0x2Packet.BuildPacket(session.id), true, false);
Server.GetWorldManager().DoLogin(session.GetActor());
client.FlushQueuedSendPackets();
break;
//Chat Received

2
FFXIVClassic Map Server/actors/chara/Character.cs
View file

@ -36,6 +36,8 @@ namespace FFXIVClassic_Map_Server.Actors
public const int L_INDEXFINGER = 26;
public const int UNKNOWN = 27;
public bool isStatic = false;
public uint modelId;
public uint[] appearanceIds = new uint[28];

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

@ -87,13 +87,17 @@ namespace FFXIVClassic_Map_Server.Actors
List<LuaParam> lParams;
Player player = Server.GetWorldManager().GetPCInWorld(playerActorId);
lParams = DoActorInit(player);
lParams = DoActorInit(player);
if (lParams != null && lParams.Count >= 3 && lParams[2].typeID == 0 && (int)lParams[2].value == 0)
isStatic = true;
if (lParams == null)
{
string classPathFake = "/Chara/Npc/Populace/PopulaceStandard";
string classNameFake = "PopulaceStandard";
lParams = LuaUtils.CreateLuaParamList(classPathFake, false, false, false, false, false, 0xF47F6, false, false, 0, 0);
isStatic = true;
//ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, classNameFake, lParams).DebugPrintSubPacket();
return ActorInstantiatePacket.BuildPacket(actorId, playerActorId, actorName, classNameFake, lParams);
}

4
FFXIVClassic Map Server/dataobjects/Session.cs
View file

@ -104,6 +104,10 @@ namespace FFXIVClassic_Map_Server.dataobjects
if (actorInstanceList.Contains(actor))
{
//Don't send for static characters (npcs)
if (actor is Character && ((Character)actor).isStatic)
continue;
GetActor().QueuePacket(actor.CreatePositionUpdatePacket(playerActor.actorId));
}
else

4
FFXIVClassic World Server/DataObjects/ClientConnection.cs
View file

@ -36,9 +36,7 @@ namespace FFXIVClassic_World_Server
while (SendPacketQueue.Count > 0)
{
BasePacket packet = SendPacketQueue.Take();
packet.DebugPrintPacket();
byte[] packetBytes = packet.GetPacketBytes();
try

2
FFXIVClassic World Server/PacketProcessor.cs
View file

@ -41,8 +41,6 @@ namespace FFXIVClassic_World_Server
List<SubPacket> subPackets = packet.GetSubpackets();
foreach (SubPacket subpacket in subPackets)
{
subpacket.DebugPrintSubPacket();
//Initial Connect Packet, Create session
if (subpacket.header.type == 0x01)
{

2
FFXIVClassic World Server/Program.cs
View file

@ -24,7 +24,7 @@ namespace FFXIVClassic_World_Server
if (System.Diagnostics.Debugger.IsAttached)
{
System.Threading.Thread.Sleep(5000);
System.Threading.Thread.Sleep(15000);
}
#endif

4
FFXIVClassic World Server/Server.cs
View file

@ -136,14 +136,16 @@ namespace FFXIVClassic_World_Server
public void OnReceiveSubPacketFromZone(ZoneServer zoneServer, SubPacket subpacket)
{
subpacket.DebugPrintSubPacket();
//subpacket.DebugPrintSubPacket();
uint sessionId = subpacket.header.targetId;
if (mZoneSessionList.ContainsKey(sessionId))
{
ClientConnection conn = mZoneSessionList[sessionId].clientConnection;
conn.QueuePacket(subpacket, true, false);
conn.FlushQueuedSendPackets();
}
}
public WorldManager GetWorldManager()