diff --git a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
index b9bbe097..9b4fa3fd 100644
--- a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
+++ b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
@@ -159,7 +159,6 @@
-
diff --git a/FFXIVClassic Map Server/actors/chara/player/Equipment.cs b/FFXIVClassic Map Server/actors/chara/player/Equipment.cs
index 3092ba39..702af284 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Equipment.cs
+++ b/FFXIVClassic Map Server/actors/chara/player/Equipment.cs
@@ -63,24 +63,24 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
}
}
- toPlayer.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, toPlayer.actorId, 0x23, Inventory.EQUIPMENT_OTHERPLAYER));
+ toPlayer.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, 0x23, Inventory.EQUIPMENT_OTHERPLAYER));
int currentIndex = 0;
while (true)
{
if (items.Count - currentIndex >= 16)
- toPlayer.QueuePacket(InventoryListX16Packet.BuildPacket(owner.actorId, toPlayer.actorId, items, ref currentIndex));
+ toPlayer.QueuePacket(InventoryListX16Packet.BuildPacket(owner.actorId, items, ref currentIndex));
else if (items.Count - currentIndex > 1)
- toPlayer.QueuePacket(InventoryListX08Packet.BuildPacket(owner.actorId, toPlayer.actorId, items, ref currentIndex));
+ toPlayer.QueuePacket(InventoryListX08Packet.BuildPacket(owner.actorId, items, ref currentIndex));
else if (items.Count - currentIndex == 1)
{
- toPlayer.QueuePacket(InventoryListX01Packet.BuildPacket(owner.actorId, toPlayer.actorId, items[currentIndex]));
+ toPlayer.QueuePacket(InventoryListX01Packet.BuildPacket(owner.actorId, items[currentIndex]));
currentIndex++;
}
else
break;
}
- toPlayer.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId, toPlayer.actorId));
+ toPlayer.QueuePacket(InventorySetEndPacket.BuildPacket(owner.actorId));
}
public void SendFullEquipment(bool DoClear)
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs
index 2c89b8bb..db5a2714 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs
@@ -9,13 +9,8 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x0148;
public const uint PACKET_SIZE = 0x90;
-
- public static SubPacket BuildPacket(uint playerActorId, InventoryItem item)
- {
- return BuildPacket(playerActorId, playerActorId, item);
- }
-
- public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, InventoryItem item)
+
+ public static SubPacket BuildPacket(uint sourceActorId, InventoryItem item)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs
index cdeccd4f..cbabf787 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs
@@ -11,13 +11,8 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x0149;
public const uint PACKET_SIZE = 0x3A8;
-
- public static SubPacket BuildPacket(uint playerActorId, List items, ref int listOffset)
- {
- return BuildPacket(playerActorId, playerActorId, items, ref listOffset);
- }
-
- public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List items, ref int listOffset)
+
+ public static SubPacket BuildPacket(uint sourceActorId, List items, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs
index 008b0d6d..90496fb6 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs
@@ -11,12 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
public const ushort OPCODE = 0x014A;
public const uint PACKET_SIZE = 0x720;
- public static SubPacket BuildPacket(uint playerActorId, List items, ref int listOffset)
- {
- return BuildPacket(playerActorId, playerActorId, items, ref listOffset);
- }
-
- public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List items, ref int listOffset)
+ public static SubPacket BuildPacket(uint sourceActorId, List items, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@@ -40,5 +35,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
return new SubPacket(OPCODE, sourceActorId, data);
}
+
}
}
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs
index 1478d157..a368d90e 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs
@@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x014B;
public const uint PACKET_SIZE = 0xE20;
-
+
public static SubPacket BuildPacket(uint playerActorID, List items, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs
index dd0d9dc2..2893425b 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs
@@ -9,7 +9,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x0152;
public const uint PACKET_SIZE = 0x28;
-
public static SubPacket BuildPacket(uint playerActorID, ushort slot)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@@ -21,7 +20,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
binWriter.Write((UInt16)slot);
}
}
-
return new SubPacket(OPCODE, playerActorID, data);
}
}
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs
index d711555b..c886caeb 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs
@@ -11,7 +11,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x0153;
public const uint PACKET_SIZE = 0x38;
-
public static SubPacket BuildPacket(uint playerActorID, List slots, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@@ -36,7 +35,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
binWriter.Write((Byte)max);
}
}
-
return new SubPacket(OPCODE, playerActorID, data);
}
}
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs
index c1899d74..75d61bfa 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs
@@ -10,12 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
public const ushort OPCODE = 0x0146;
public const uint PACKET_SIZE = 0x28;
- public static SubPacket BuildPacket(uint playerActorId, ushort size, ushort code)
- {
- return BuildPacket(playerActorId, playerActorId, size, code);
- }
-
- public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, ushort size, ushort code)
+ public static SubPacket BuildPacket(uint sourceActorId, ushort size, ushort code)
{
byte[] data = new byte[8];
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs
index 2eaca4fe..5f899491 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs
@@ -4,7 +4,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
class InventorySetEndPacket
{
-
public const ushort OPCODE = 0x0147;
public const uint PACKET_SIZE = 0x28;
@@ -12,11 +11,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
return new SubPacket(OPCODE, playerActorId, new byte[8]);
}
-
- public static SubPacket BuildPacket(uint sourceActorId, uint targetActorID)
- {
- return new SubPacket(OPCODE, sourceActorId, new byte[8]);
- }
-
+
}
}