cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxivclassic-lobby-server

Browse Source 
Conflicts:
	FFXIVClassic_Lobby_Server/packets/CharacterListPacket.cs
This commit is contained in:
Filip Maj
2015-09-11 18:59:08 -04:00
parent d6ec5e7240 d96f5be7ac
commit aadca3968d
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FFXIVClassic_Lobby_Server/packets/CharacterListPacket.cs
View File

@@ -43,7 +43,8 @@ namespace FFXIVClassic_Lobby_Server.packets
//Write List Info //Write List Info
binWriter.Write((UInt64)sequence); binWriter.Write((UInt64)sequence);
binWriter.Write(maxChars - totalCount <= MAXPERPACKET ? (byte)(maxChars + 1) : (byte)0); byte listTracker = (byte)((MAXPERPACKET * 2) * subPackets.Count);
binWriter.Write(characterList.Count - totalCount <= MAXPERPACKET ? (byte)(listTracker + 1) : (byte)(listTracker));
//binWriter.Write((byte)1); //binWriter.Write((byte)1);
binWriter.Write(maxChars - totalCount <= MAXPERPACKET ? (UInt32)(maxChars - totalCount) : (UInt32)MAXPERPACKET); binWriter.Write(maxChars - totalCount <= MAXPERPACKET ? (UInt32)(maxChars - totalCount) : (UInt32)MAXPERPACKET);
binWriter.Write((byte)0); binWriter.Write((byte)0);
@@ -144,7 +145,8 @@ namespace FFXIVClassic_Lobby_Server.packets
//Write Empty List Info //Write Empty List Info
binWriter.Write((UInt64)sequence); binWriter.Write((UInt64)sequence);
binWriter.Write((byte)1); byte listTracker = (byte)((MAXPERPACKET * 2) * subPackets.Count);
binWriter.Write(characterList.Count - totalCount <= MAXPERPACKET ? (byte)(listTracker + 1) : (byte)(listTracker));
binWriter.Write((UInt32)0); binWriter.Write((UInt32)0);
binWriter.Write((byte)0); binWriter.Write((byte)0);
binWriter.Write((UInt16)0); binWriter.Write((UInt16)0);

6
FFXIVClassic_Lobby_Server/packets/ImportListPacket.cs
View File

@@ -41,7 +41,8 @@ namespace FFXIVClassic_Lobby_Server.packets
//Write List Info //Write List Info
binWriter.Write((UInt64)sequence); binWriter.Write((UInt64)sequence);
binWriter.Write(namesList.Count - totalCount <= MAXPERPACKET ? (byte)(namesList.Count + 1) : (byte)0); byte listTracker = (byte)((MAXPERPACKET * 2) * subPackets.Count);
binWriter.Write(namesList.Count - totalCount <= MAXPERPACKET ? (byte)(listTracker + 1) : (byte)(listTracker));
binWriter.Write(namesList.Count - totalCount <= MAXPERPACKET ? (UInt32)(namesList.Count - totalCount) : (UInt32)MAXPERPACKET); binWriter.Write(namesList.Count - totalCount <= MAXPERPACKET ? (UInt32)(namesList.Count - totalCount) : (UInt32)MAXPERPACKET);
binWriter.Write((byte)0); binWriter.Write((byte)0);
binWriter.Write((UInt16)0); binWriter.Write((UInt16)0);
@@ -82,7 +83,8 @@ namespace FFXIVClassic_Lobby_Server.packets
//Write Empty List Info //Write Empty List Info
binWriter.Write((UInt64)sequence); binWriter.Write((UInt64)sequence);
binWriter.Write((byte)1); byte listTracker = (byte)((MAXPERPACKET * 2) * subPackets.Count);
binWriter.Write(namesList.Count - totalCount <= MAXPERPACKET ? (byte)(listTracker + 1) : (byte)(listTracker));
binWriter.Write((UInt32)0); binWriter.Write((UInt32)0);
binWriter.Write((byte)0); binWriter.Write((byte)0);
binWriter.Write((UInt16)0); binWriter.Write((UInt16)0);

7
FFXIVClassic_Lobby_Server/packets/RetainerListPacket.cs
View File

@@ -41,11 +41,11 @@ namespace FFXIVClassic_Lobby_Server.packets
//Write List Info //Write List Info
binWriter.Write((UInt64)sequence); binWriter.Write((UInt64)sequence);
binWriter.Write(retainerList.Count - totalCount <= MAXPERPACKET ? (byte)(retainerList.Count + 1) : (byte)0); byte listTracker = (byte)((MAXPERPACKET * 2) * subPackets.Count);
binWriter.Write(retainerList.Count - totalCount <= MAXPERPACKET ? (byte)(listTracker + 1) : (byte)(listTracker));
binWriter.Write(retainerList.Count - totalCount <= MAXPERPACKET ? (UInt32)(retainerList.Count - totalCount) : (UInt32)MAXPERPACKET); binWriter.Write(retainerList.Count - totalCount <= MAXPERPACKET ? (UInt32)(retainerList.Count - totalCount) : (UInt32)MAXPERPACKET);
binWriter.Write((byte)0); binWriter.Write((byte)0);
binWriter.Write((UInt16)0); binWriter.Write((UInt16)0);
binWriter.Write((UInt64)0); binWriter.Write((UInt64)0);
binWriter.Write((UInt32)0); binWriter.Write((UInt32)0);
} }
@@ -84,7 +84,8 @@ namespace FFXIVClassic_Lobby_Server.packets
//Write Empty List Info //Write Empty List Info
binWriter.Write((UInt64)sequence); binWriter.Write((UInt64)sequence);
binWriter.Write((byte)1); byte listTracker = (byte)((MAXPERPACKET * 2) * subPackets.Count);
binWriter.Write(retainerList.Count - totalCount <= MAXPERPACKET ? (byte)(listTracker + 1) : (byte)(listTracker));
binWriter.Write((UInt32)0); binWriter.Write((UInt32)0);
binWriter.Write((byte)0); binWriter.Write((byte)0);
binWriter.Write((UInt16)0); binWriter.Write((UInt16)0);

6
FFXIVClassic_Lobby_Server/packets/WorldListPacket.cs
View File

@@ -41,7 +41,8 @@ namespace FFXIVClassic_Lobby_Server.packets
//Write List Info //Write List Info
binWriter.Write((UInt64)sequence); binWriter.Write((UInt64)sequence);
binWriter.Write(worldList.Count - totalCount <= MAXPERPACKET ? (byte)(worldList.Count + 1) : (byte)0); byte listTracker = (byte)((MAXPERPACKET * 2) * subPackets.Count);
binWriter.Write(worldList.Count - totalCount <= MAXPERPACKET ? (byte)(listTracker + 1) : (byte)(listTracker));
binWriter.Write(worldList.Count - totalCount <= MAXPERPACKET ? (UInt32)(worldList.Count - totalCount) : (UInt32)MAXPERPACKET); binWriter.Write(worldList.Count - totalCount <= MAXPERPACKET ? (UInt32)(worldList.Count - totalCount) : (UInt32)MAXPERPACKET);
binWriter.Write((byte)0); binWriter.Write((byte)0);
binWriter.Write((UInt16)0); binWriter.Write((UInt16)0);
@@ -80,7 +81,8 @@ namespace FFXIVClassic_Lobby_Server.packets
//Write Empty List Info //Write Empty List Info
binWriter.Write((UInt64)sequence); binWriter.Write((UInt64)sequence);
binWriter.Write((byte)1); byte listTracker = (byte)((MAXPERPACKET * 2) * subPackets.Count);
binWriter.Write(worldList.Count - totalCount <= MAXPERPACKET ? (byte)(listTracker + 1) : (byte)(listTracker));
binWriter.Write((UInt32)0); binWriter.Write((UInt32)0);
binWriter.Write((byte)0); binWriter.Write((byte)0);
binWriter.Write((UInt16)0); binWriter.Write((UInt16)0);