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/ffxiv-classic-server into method_casing

Browse Source 
# Conflicts:
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/area/PrivateArea.cs
#	FFXIVClassic Map Server/actors/area/Zone.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/common/Utils.cs
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
This commit is contained in:
Tahir Akhlaq
2016-06-14 22:54:02 +01:00
parent 24f55139dd f5619ff800
commit 335a59204c
521 changed files with 12848 additions and 10394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs
View File

@@ -5,11 +5,11 @@
public const ushort OPCODE = 0x016D;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId)
public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId)
{
byte[] data = new byte[8];
data[0] = 2;
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data);
}
public static SubPacket BuildPacket(uint playerActorID)

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs
View File

@@ -5,9 +5,9 @@
public const ushort OPCODE = 0x016E;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId)
public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId)
{
return new SubPacket(OPCODE, sourceActorId, targetActorId, new byte[8]);
return new SubPacket(OPCODE, sourceActorId, tarGetActorId, new byte[8]);
}
public static SubPacket BuildPacket(uint playerActorID)

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs
View File

@@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
return BuildPacket(playerActorId, playerActorId, item);
}
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, InventoryItem item)
public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, InventoryItem item)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data);
}
}

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs
View File

@@ -15,7 +15,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
return BuildPacket(playerActorId, playerActorId, items, ref listOffset);
}
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List<InventoryItem> items, ref int listOffset)
public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, List<InventoryItem> items, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@@ -40,7 +40,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data);
}
}
}

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs
View File

@@ -14,7 +14,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
return BuildPacket(playerActorId, playerActorId, items, ref listOffset);
}
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List<InventoryItem> items, ref int listOffset)
public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, List<InventoryItem> items, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data);
}
}
}

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs
View File

@@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
return BuildPacket(playerActorId, playerActorId, size, code);
}
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, ushort size, ushort code)
public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, ushort size, ushort code)
{
byte[] data = new byte[8];
@@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
}
}
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data);
}
}

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs
View File

@@ -11,9 +11,9 @@
return new SubPacket(OPCODE, playerActorId, playerActorId, new byte[8]);
}
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorID)
public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorID)
{
return new SubPacket(OPCODE, sourceActorId, targetActorID, new byte[8]);
return new SubPacket(OPCODE, sourceActorId, tarGetActorID, new byte[8]);
}
}