diff --git a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj index 9b4fa3fd..1718595f 100644 --- a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj +++ b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj @@ -201,8 +201,7 @@ - - + diff --git a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs index a2726493..0db33a71 100644 --- a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs +++ b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs @@ -187,7 +187,7 @@ namespace FFXIVClassic_Map_Server.Actors subpackets.Add(CreateSpawnPositonPacket(0x0)); if (isMapObj) - subpackets.Add(_0xD8Packet.BuildPacket(actorId, instance, layout)); + subpackets.Add(SetActorBGPropertiesPacket.BuildPacket(actorId, instance, layout)); else subpackets.Add(CreateAppearancePacket()); diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0xD8Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorBGPropertiesPacket.cs similarity index 95% rename from FFXIVClassic Map Server/packets/send/Actor/_0xD8Packet.cs rename to FFXIVClassic Map Server/packets/send/Actor/SetActorBGPropertiesPacket.cs index 36f59f84..f1acefcb 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0xD8Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorBGPropertiesPacket.cs @@ -5,7 +5,7 @@ using System; namespace FFXIVClassic_Map_Server.packets.send.actor { - class _0xD8Packet + class SetActorBGPropertiesPacket { public const ushort OPCODE = 0x00D8; public const uint PACKET_SIZE = 0x28; diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0xD9Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/_0xD9Packet.cs deleted file mode 100644 index 041e0390..00000000 --- a/FFXIVClassic Map Server/packets/send/Actor/_0xD9Packet.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.IO; - -using FFXIVClassic.Common; -using System; -using System.Text; - -namespace FFXIVClassic_Map_Server.packets.send.actor -{ - class _0xD9Packet - { - public const ushort OPCODE = 0x00D9; - public const uint PACKET_SIZE = 0x28; - - public static SubPacket BuildPacket(uint sourceActorId, string anim) - { - byte[] data = new byte[PACKET_SIZE - 0x20]; - - using (MemoryStream mem = new MemoryStream(data)) - { - using (BinaryWriter binWriter = new BinaryWriter(mem)) - { - binWriter.Write(Encoding.ASCII.GetBytes(anim), 0, Encoding.ASCII.GetByteCount(anim) >= 4 ? 4 : Encoding.ASCII.GetByteCount(anim)); - } - } - - return new SubPacket(OPCODE, sourceActorId, data); - } - } -}