mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-07-25 03:48:23 +02:00
Finished refactoring Map Server. Clear of syntax errors.
This commit is contained in:
parent
d8ac8216c4
commit
7c4091a196
89 changed files with 211 additions and 188 deletions
|
@ -32,7 +32,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -55,7 +55,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -55,7 +55,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
|
||||
return new SubPacket(OPCODE, playerActorId, data);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
|
||||
return new SubPacket(OPCODE, playerActorId, data);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
|
||||
return new SubPacket(OPCODE, playerActorId, data);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
|
||||
return new SubPacket(OPCODE, playerActorId, data);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -11,13 +11,13 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
{
|
||||
byte[] data = new byte[8];
|
||||
data[0] = 2;
|
||||
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
|
||||
public static SubPacket BuildPacket(uint playerActorID)
|
||||
{
|
||||
byte[] data = new byte[8];
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
data = mem.GetBuffer();
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
data = mem.GetBuffer();
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -10,12 +10,12 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
|
|||
|
||||
public static SubPacket BuildPacket(uint playerActorId)
|
||||
{
|
||||
return new SubPacket(OPCODE, playerActorId, playerActorId, new byte[8]);
|
||||
return new SubPacket(OPCODE, playerActorId, new byte[8]);
|
||||
}
|
||||
|
||||
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorID)
|
||||
{
|
||||
return new SubPacket(OPCODE, sourceActorId, targetActorID, new byte[8]);
|
||||
return new SubPacket(OPCODE, sourceActorId, new byte[8]);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send
|
|||
|
||||
public static SubPacket BuildPacket(uint playerActorID)
|
||||
{
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]);
|
||||
return new SubPacket(OPCODE, playerActorID, new byte[8]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.receive
|
|||
}
|
||||
}
|
||||
|
||||
SubPacket subpacket = new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
SubPacket subpacket = new SubPacket(OPCODE, playerActorID, data);
|
||||
return subpacket;
|
||||
}
|
||||
|
||||
|
|
|
@ -7,9 +7,9 @@ namespace FFXIVClassic_Map_Server.packets.send
|
|||
public const ushort OPCODE = 0x0011;
|
||||
public const uint PACKET_SIZE = 0x28;
|
||||
|
||||
public static SubPacket BuildPacket(uint playerActorID)
|
||||
public static SubPacket BuildPacket(uint sourceActorId)
|
||||
{
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]);
|
||||
return new SubPacket(OPCODE, sourceActorId, new byte[8]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
|
||||
return new SubPacket(OPCODE, playerActorId, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
|
||||
return new SubPacket(OPCODE, playerActorId, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send
|
|||
{
|
||||
byte[] data = new byte[PACKET_SIZE - 0x20];
|
||||
data[0] = (Byte) (val & 0xFF);
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ namespace FFXIVClassic_Map_Server.packets.send.groups
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -56,7 +56,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -201,7 +201,7 @@ namespace FFXIVClassic_Map_Server.packets.send.groups
|
|||
|
||||
closeStreams();
|
||||
|
||||
SubPacket packet = new SubPacket(OPCODE, playerActorID, actorID, data);
|
||||
SubPacket packet = new SubPacket(OPCODE, actorID, data);
|
||||
return packet;
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment
|
|||
{
|
||||
if (details == null)
|
||||
{
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, sourceActorId, data);
|
||||
}
|
||||
|
||||
binWriter.Write((UInt32)details.purposeId);
|
||||
|
|
|
@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk
|
|||
{
|
||||
byte[] data = new byte[PACKET_SIZE - 0x20];
|
||||
data[0] = 1;
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk
|
|||
|
||||
data[0] = (byte)(wasSent ? 0x1 : 0x0);
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk
|
|||
}
|
||||
}
|
||||
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.supportdesk
|
|||
{
|
||||
byte[] data = new byte[PACKET_SIZE - 0x20];
|
||||
data[0] = (byte)(startGM ? 1 : 0);
|
||||
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
|
||||
return new SubPacket(OPCODE, playerActorID, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue