From a2647452077a678a73bdc37629df0d5d2c44980e Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 27 Jun 2017 13:23:05 -0400 Subject: [PATCH] Started removing all target actor id references. --- FFXIVClassic Common Class Lib/SubPacket.cs | 9 +++++++-- .../packets/send/Actor/ActorDoEmotePacket.cs | 4 ++-- .../packets/send/Actor/ActorInstantiatePacket.cs | 4 ++-- .../packets/send/Actor/ActorSpecialGraphicPacket.cs | 4 ++-- .../packets/send/Actor/AddActorPacket.cs | 4 ++-- .../packets/send/Actor/BattleAction1Packet.cs | 4 ++-- .../packets/send/Actor/DeleteAllActorsPacket.cs | 4 ++-- .../packets/send/Actor/MoveActorToPositionPacket.cs | 4 ++-- .../packets/send/Actor/PlayAnimationOnActorPacket.cs | 4 ++-- .../packets/send/Actor/PlayBGAnimation.cs | 4 ++-- .../packets/send/Actor/RemoveActorPacket.cs | 6 +++--- .../packets/send/Actor/SetActorAppearancePacket.cs | 4 ++-- .../packets/send/Actor/SetActorIconPacket.cs | 4 ++-- .../packets/send/Actor/SetActorIsZoningPacket.cs | 4 ++-- .../packets/send/Actor/SetActorNamePacket.cs | 4 ++-- .../packets/send/Actor/SetActorPositionPacket.cs | 4 ++-- .../packets/send/Actor/SetActorPropetyPacket.cs | 4 ++-- .../packets/send/Actor/SetActorSpeedPacket.cs | 8 ++++---- .../packets/send/Actor/SetActorStatePacket.cs | 4 ++-- .../packets/send/Actor/SetActorStatusAllPacket.cs | 4 ++-- .../packets/send/Actor/SetActorStatusPacket.cs | 4 ++-- .../packets/send/Actor/SetActorSubStatPacket.cs | 4 ++-- .../packets/send/Actor/SetActorTargetAnimatedPacket.cs | 4 ++-- .../packets/send/Actor/SetActorTargetPacket.cs | 4 ++-- .../packets/send/Actor/_0x132Packet.cs | 4 ++-- .../packets/send/Actor/_0xD8Packet.cs | 4 ++-- .../packets/send/Actor/_0xD9Packet.cs | 4 ++-- FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs | 4 ++-- FFXIVClassic Map Server/packets/send/SetMusicPacket.cs | 4 ++-- FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs | 4 ++-- .../packets/send/events/EndEventPacket.cs | 6 +++--- .../packets/send/events/KickEventPacket.cs | 8 ++++---- .../packets/send/events/RunEventFunctionPacket.cs | 6 +++--- FFXIVClassic Map Server/packets/send/login/0x2Packet.cs | 6 +++--- .../packets/send/login/0x7ResponsePacket.cs | 4 ++-- .../packets/send/player/AchievementEarnedPacket.cs | 4 ++-- .../packets/send/player/InfoRequestResponsePacket.cs | 4 ++-- .../packets/send/player/SendAchievementRatePacket.cs | 4 ++-- .../packets/send/player/SetAchievementPointsPacket.cs | 4 ++-- .../packets/send/player/SetChocoboNamePacket.cs | 4 ++-- .../send/player/SetCompletedAchievementsPacket.cs | 4 ++-- .../packets/send/player/SetCurrentJobPacket.cs | 4 ++-- .../packets/send/player/SetCurrentMountChocoboPacket.cs | 4 ++-- .../packets/send/player/SetCurrentMountGoobbuePacket.cs | 4 ++-- .../packets/send/player/SetCutsceneBookPacket.cs | 4 ++-- .../packets/send/player/SetGrandCompanyPacket.cs | 4 ++-- .../packets/send/player/SetHasChocoboPacket.cs | 4 ++-- .../packets/send/player/SetHasGoobbuePacket.cs | 4 ++-- .../packets/send/player/SetLatestAchievementsPacket.cs | 4 ++-- .../packets/send/player/SetPlayerDreamPacket.cs | 4 ++-- .../packets/send/player/SetPlayerItemStoragePacket.cs | 4 ++-- .../packets/send/player/SetPlayerTitlePacket.cs | 4 ++-- .../packets/send/player/SetSpecialEventWorkPacket.cs | 4 ++-- .../send/recruitment/CurrentRecruitmentDetailsPacket.cs | 4 ++-- .../packets/send/recruitment/EndRecruitmentPacket.cs | 4 ++-- .../packets/send/recruitment/RecruiterStatePacket.cs | 4 ++-- .../packets/send/recruitment/StartRecruitingResponse.cs | 4 ++-- .../packets/send/social/BlacklistAddedPacket.cs | 4 ++-- .../packets/send/social/BlacklistRemovedPacket.cs | 4 ++-- .../packets/send/social/FriendStatusPacket.cs | 4 ++-- .../packets/send/social/FriendlistAddedPacket.cs | 4 ++-- .../packets/send/social/FriendlistRemovedPacket.cs | 4 ++-- .../packets/send/social/SendBlacklistPacket.cs | 4 ++-- .../packets/send/social/SendFriendlistPacket.cs | 4 ++-- 64 files changed, 141 insertions(+), 136 deletions(-) diff --git a/FFXIVClassic Common Class Lib/SubPacket.cs b/FFXIVClassic Common Class Lib/SubPacket.cs index 38394e29..08faadbd 100644 --- a/FFXIVClassic Common Class Lib/SubPacket.cs +++ b/FFXIVClassic Common Class Lib/SubPacket.cs @@ -72,7 +72,7 @@ namespace FFXIVClassic.Common offset += header.subpacketSize; } - public SubPacket(ushort opcode, uint sourceId, uint targetId, byte[] data) : this(true, opcode, sourceId, targetId, data) { } + public SubPacket(ushort opcode, uint sourceId, byte[] data) : this(true, opcode, sourceId, targetId, data) { } public SubPacket(bool isGameMessage, ushort opcode, uint sourceId, uint targetId, byte[] data) { @@ -89,7 +89,7 @@ namespace FFXIVClassic.Common } header.sourceId = sourceId; - header.targetId = targetId; + header.targetId = 0; if (isGameMessage) header.type = 0x03; @@ -117,6 +117,11 @@ namespace FFXIVClassic.Common data = original.data; } + public void SetTargetId(uint target) + { + this.header.targetId = target; + } + public byte[] GetHeaderBytes() { var size = Marshal.SizeOf(header); diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs index 17767f3d..312ab394 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00E1; public const uint PACKET_SIZE = 0x30; - public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, uint targettedActorId, uint animationId, uint descriptionId) + public static SubPacket BuildPacket(uint sourceActorId, uint targettedActorId, uint animationId, uint descriptionId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -32,7 +32,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - SubPacket packet = new SubPacket(OPCODE, sourceActorId, targetActorId, data); + SubPacket packet = new SubPacket(OPCODE, sourceActorId, data); packet.DebugPrintSubPacket(); return packet; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs index 49b50b9f..e76853cf 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CC; public const uint PACKET_SIZE = 0x128; - public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, string objectName, string className, List initParams) + public static SubPacket BuildPacket(uint sourceActorId, string objectName, string className, List initParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, sourceActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs index de6fc3de..45945c2c 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs @@ -15,7 +15,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00E3; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, int iconCode) + public static SubPacket BuildPacket(uint sourceActorId, int iconCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, targetActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs index 138fdbe7..6cf7d5f9 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs @@ -9,12 +9,12 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CA; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint actorID, byte val) + public static SubPacket BuildPacket(uint sourceActorId, byte val) { byte[] data = new byte[PACKET_SIZE-0x20]; data[0] = val; //Why? - return new SubPacket(OPCODE, playerActorID, actorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs index 84122ce1..38fe2344 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0139; public const uint PACKET_SIZE = 0x58; - public static SubPacket BuildPacket(uint sourceId, uint targetId) + public static SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -21,7 +21,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, sourceId, targetId, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs index b2052341..b413eb7d 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs @@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0007; 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]); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs index e807c4d6..884fb575 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CF; public const uint PACKET_SIZE = 0x50; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, float x, float y, float z, float rot, ushort moveState) + public static SubPacket BuildPacket(uint sourceActorId, float x, float y, float z, float rot, ushort moveState) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - SubPacket packet = new SubPacket(OPCODE, playerActorID, targetActorID, data); + SubPacket packet = new SubPacket(OPCODE, sourceActorId, data); return packet; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/PlayAnimationOnActorPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/PlayAnimationOnActorPacket.cs index c186e0d9..cd5ed453 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/PlayAnimationOnActorPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/PlayAnimationOnActorPacket.cs @@ -12,9 +12,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00DA; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint animationID) + public static SubPacket BuildPacket(uint sourceActorId, uint animationID) { - return new SubPacket(OPCODE, playerActorID, targetActorID, BitConverter.GetBytes((ulong)animationID)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((ulong)animationID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs b/FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs index 7ffc20f7..597b8373 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs @@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00D9; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, string animName) + public static SubPacket BuildPacket(uint sourceActorId, string animName) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs index 9240f53e..06344f2a 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CB; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint actorId) + public static SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -18,11 +18,11 @@ namespace FFXIVClassic_Map_Server.packets.send.actor { using (BinaryWriter binWriter = new BinaryWriter(mem)) { - binWriter.Write((UInt32)actorId); + binWriter.Write((UInt32)sourceActorId); } } - return new SubPacket(OPCODE, actorId, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs index 0e4ed34a..f1a864ea 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs @@ -53,7 +53,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor appearanceIDs = appearanceTable; } - public SubPacket BuildPacket(uint playerActorID, uint actorID) + public SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -74,7 +74,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } - SubPacket packet = new SubPacket(OPCODE, playerActorID, actorID, data); + SubPacket packet = new SubPacket(OPCODE, sourceActorId, data); return packet; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs index 6dde6397..e5d52265 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs @@ -14,7 +14,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0145; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint iconCode) + public static SubPacket BuildPacket(uint sourceActorId, uint iconCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs index 4dfa29f3..13dff947 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs @@ -7,11 +7,11 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x017B; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, bool isDimmed) + public static SubPacket BuildPacket(uint sourceActorId, bool isDimmed) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(isDimmed ? 1 : 0); - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs index 9df353ce..bd421600 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x013D; public const uint PACKET_SIZE = 0x48; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint displayNameID, string customName) + public static SubPacket BuildPacket(uint sourceActorId, uint displayNameID, string customName) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -29,7 +29,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - SubPacket packet = new SubPacket(OPCODE, playerActorID, targetActorID, data); + SubPacket packet = new SubPacket(OPCODE, sourceActorId, data); return packet; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs index fce26791..a19dba52 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs @@ -19,7 +19,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort SPAWNTYPE_WARP_DUTY2 = 6; public const ushort SPAWNTYPE_WARP_LIGHT = 7; - public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, uint actorId, float x, float y, float z, float rotation, ushort spawnType, bool isZoningPlayer) + public static SubPacket BuildPacket(uint sourceActorId, uint actorId, float x, float y, float z, float rotation, ushort spawnType, bool isZoningPlayer) { byte[] data = new byte[PACKET_SIZE-0x20]; @@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, sourceActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs index 37996dbd..aabba72e 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs @@ -209,14 +209,14 @@ namespace FFXIVClassic_Map_Server.packets.send.actor currentTarget = newTarget; } - public SubPacket BuildPacket(uint playerActorID, uint actorID) + public SubPacket BuildPacket(uint sourceActorId) { binWriter.Seek(0, SeekOrigin.Begin); binWriter.Write((byte)runningByteTotal); CloseStreams(); - SubPacket packet = new SubPacket(OPCODE, actorID, playerActorID, data); + SubPacket packet = new SubPacket(OPCODE, sourceActorId, data); return packet; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs index d266ef5b..0e557cf4 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs @@ -14,7 +14,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const float DEFAULT_RUN = 5.0f; public const float DEFAULT_ACTIVE = 5.0f; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) + public static SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -40,10 +40,10 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, float stopSpeed, float walkSpeed, float runSpeed, float activeSpeed) + public static SubPacket BuildPacket(uint sourceActorId, float stopSpeed, float walkSpeed, float runSpeed, float activeSpeed) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -69,7 +69,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs index 356b4f38..ddc1fb43 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs @@ -30,10 +30,10 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x134; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetID, uint mainState, uint subState) + public static SubPacket BuildPacket(uint sourceActorId, uint mainState, uint subState) { ulong combined = (mainState & 0xFF) | ((subState & 0xFF) << 8); - return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes(combined)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes(combined)); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs index 429096ef..04d0d7f4 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0179; public const uint PACKET_SIZE = 0x48; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, ushort[] statusIds) + public static SubPacket BuildPacket(uint sourceActorId, ushort[] statusIds) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - SubPacket packet = new SubPacket(OPCODE, playerActorID, targetActorID, data); + SubPacket packet = new SubPacket(OPCODE, sourceActorId, data); return packet; } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs index 8bd6172d..32c98f5b 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0177; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, ushort index, ushort statusCode) + public static SubPacket BuildPacket(uint sourceActorId, ushort index, ushort statusCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorSubStatPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorSubStatPacket.cs index b1f36b40..5c8da573 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorSubStatPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorSubStatPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x144; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetID, byte breakage, int leftChant, int rightChant, int guard, int wasteStat, int statMode, uint idleAnimationId) + public static SubPacket BuildPacket(uint sourceActorId, byte breakage, int leftChant, int rightChant, int guard, int wasteStat, int statMode, uint idleAnimationId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs index f2f86d75..6cae2cf8 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs @@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00D3; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint targetID) + public static SubPacket BuildPacket(uint sourceActorId, uint targetID) { - return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes((ulong)targetID)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((ulong)targetID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs index cd2e86e6..1fa2e8b6 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs @@ -8,9 +8,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00DB; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint targetID) + public static SubPacket BuildPacket(uint sourceActorId, uint targetID) { - return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes((ulong)targetID)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((ulong)targetID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs index b0f8bb89..1b6561ae 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x132; public const uint PACKET_SIZE = 0x48; - public static SubPacket BuildPacket(uint playerActorID, ushort number, string function) + public static SubPacket BuildPacket(uint sourceActorId, ushort number, string function) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0xD8Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/_0xD8Packet.cs index 6753f7b6..36f59f84 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0xD8Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/_0xD8Packet.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00D8; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint val1, uint val2) + public static SubPacket BuildPacket(uint sourceActorId, uint val1, uint val2) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0xD9Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/_0xD9Packet.cs index f5198508..041e0390 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0xD9Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/_0xD9Packet.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00D9; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, string anim) + public static SubPacket BuildPacket(uint sourceActorId, string anim) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs index 2f54191d..4826218e 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x000F; public const uint PACKET_SIZE = 0x38; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) + public static SubPacket BuildPacket(uint sourceActor) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -21,7 +21,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActor, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs b/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs index dfe477b1..666ff463 100644 --- a/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs +++ b/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs @@ -16,10 +16,10 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort EFFECT_PLAY_NORMAL_CHANNEL = 0x5; //Only works for multi channeled music public const ushort EFFECT_PLAY_BATTLE_CHANNEL = 0x6; - public static SubPacket BuildPacket(uint playerActorID, ushort musicID, ushort musicTrackMode) + public static SubPacket BuildPacket(uint sourceActorId, ushort musicID, ushort musicTrackMode) { ulong combined = (ulong)(musicID | (musicTrackMode << 16)); - return new SubPacket(OPCODE, 0, playerActorID, BitConverter.GetBytes(combined)); + return new SubPacket(OPCODE, 0, BitConverter.GetBytes(combined)); } } } diff --git a/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs b/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs index 93d1f425..28c5c25b 100644 --- a/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs +++ b/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs @@ -37,10 +37,10 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort OPCODE = 0x000D; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, ushort weatherId, ushort transitionTime) + public static SubPacket BuildPacket(uint sourceActorId, ushort weatherId, ushort transitionTime) { ulong combined = (ulong)(weatherId | (transitionTime << 16)); - return new SubPacket(OPCODE, 0, playerActorID, BitConverter.GetBytes(combined)); + return new SubPacket(OPCODE, 0, BitConverter.GetBytes(combined)); } } } diff --git a/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs b/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs index ddc8fc51..1c8e3ec5 100644 --- a/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs +++ b/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events public const ushort OPCODE = 0x0131; public const uint PACKET_SIZE = 0x50; - public static SubPacket BuildPacket(uint playerActorID, uint eventOwnerActorID, string eventStarter) + public static SubPacket BuildPacket(uint sourcePlayerActorId, uint eventOwnerActorID, string eventStarter) { byte[] data = new byte[PACKET_SIZE - 0x20]; int maxBodySize = data.Length - 0x80; @@ -20,14 +20,14 @@ namespace FFXIVClassic_Map_Server.packets.send.events { using (BinaryWriter binWriter = new BinaryWriter(mem)) { - binWriter.Write((UInt32)playerActorID); + binWriter.Write((UInt32)sourcePlayerActorId); binWriter.Write((UInt32)0); binWriter.Write((Byte)1); binWriter.Write(Encoding.ASCII.GetBytes(eventStarter), 0, Encoding.ASCII.GetByteCount(eventStarter) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(eventStarter)); } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourcePlayerActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs b/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs index 972c5540..fe0a2d19 100644 --- a/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs +++ b/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events public const ushort OPCODE = 0x012F; public const uint PACKET_SIZE = 0x90; - public static SubPacket BuildPacket(uint playerActorId, uint targetActorId, string conditionName, List luaParams) + public static SubPacket BuildPacket(uint sourcePlayerActorId, uint targetEventActorId, string conditionName, List luaParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -21,8 +21,8 @@ namespace FFXIVClassic_Map_Server.packets.send.events { using (BinaryWriter binWriter = new BinaryWriter(mem)) { - binWriter.Write((UInt32)playerActorId); - binWriter.Write((UInt32)targetActorId); + binWriter.Write((UInt32)sourcePlayerActorId); + binWriter.Write((UInt32)targetEventActorId); int test = 0x75dc1705; //This will crash if set to 0 on pushCommand but not for mining which has to be 0???? @@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events } } - return new SubPacket(OPCODE, playerActorId, playerActorId, data); + return new SubPacket(OPCODE, sourcePlayerActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs b/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs index 8320f103..919114ca 100644 --- a/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs +++ b/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events public const ushort OPCODE = 0x0130; public const uint PACKET_SIZE = 0x2B8; - public static SubPacket BuildPacket(uint playerActorID, uint eventOwnerActorID, string eventStarter, string callFunction, List luaParams) + public static SubPacket BuildPacket(uint sourcePlayerActorId, uint eventOwnerActorID, string eventStarter, string callFunction, List luaParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; int maxBodySize = data.Length - 0x80; @@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events { using (BinaryWriter binWriter = new BinaryWriter(mem)) { - binWriter.Write((UInt32)playerActorID); + binWriter.Write((UInt32)sourcePlayerActorId); binWriter.Write((UInt32)eventOwnerActorID); binWriter.Write((Byte)5); binWriter.Write(Encoding.ASCII.GetBytes(eventStarter), 0, Encoding.ASCII.GetByteCount(eventStarter) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(eventStarter)); @@ -34,7 +34,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourcePlayerActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs b/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs index 72952578..cd13514a 100644 --- a/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs +++ b/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.login public const ushort OPCODE = 0x0002; public const uint PACKET_SIZE = 0x30; - public static SubPacket BuildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE-0x20]; @@ -18,11 +18,11 @@ namespace FFXIVClassic_Map_Server.packets.send.login using (BinaryWriter binWriter = new BinaryWriter(mem)) { binWriter.BaseStream.Seek(0x8, SeekOrigin.Begin); - binWriter.Write((uint)playerActorID); + binWriter.Write((uint)sourceActorId); } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs b/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs index 7278b1f1..44885647 100644 --- a/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.login { class Login0x7ResponsePacket { - public static BasePacket BuildPacket(uint actorID, uint time, uint type) + public static BasePacket BuildPacket(uint sourceActorId, uint time, uint type) { byte[] data = new byte[0x18]; @@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.login binWriter.Write((uint)0); binWriter.Write((uint)0xFFFFFD7F); - binWriter.Write((uint)actorID); + binWriter.Write((uint)sourceActorId); binWriter.Write((uint)time); } catch (Exception) diff --git a/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs b/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs index f7a9ed11..b6321ecf 100644 --- a/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs @@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019E; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint achievementID) + public static SubPacket BuildPacket(uint sourceActorId, uint achievementID) { - return new SubPacket(OPCODE, playerActorID, playerActorID, BitConverter.GetBytes((UInt64)achievementID)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((UInt64)achievementID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs b/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs index dd3535c0..6af21e9e 100644 --- a/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0133; public const uint PACKET_SIZE = 0xE0; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, List luaParams) + public static SubPacket BuildPacket(uint sourceActorId, List luaParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs b/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs index 0bef5b62..f7145d07 100644 --- a/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019F; public const uint PACKET_SIZE = 0x30; - public static SubPacket BuildPacket(uint playerActorID, uint achievementId, uint progressCount, uint progressFlags) + public static SubPacket BuildPacket(uint sourceActorId, uint achievementId, uint progressCount, uint progressFlags) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs index 8000b570..24f8e277 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs @@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019C; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint numAchievementPoints) + public static SubPacket BuildPacket(uint sourceActorId, uint numAchievementPoints) { - return new SubPacket(OPCODE, playerActorID, playerActorID, BitConverter.GetBytes((UInt64) numAchievementPoints)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((UInt64) numAchievementPoints)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs index 97f9850e..2c2d4d07 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs @@ -9,11 +9,11 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0198; public const uint PACKET_SIZE = 0x40; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, string name) + public static SubPacket BuildPacket(uint sourceActorId, string name) { if (Encoding.Unicode.GetByteCount(name) >= 0x20) name = "ERR: Too Long"; - return new SubPacket(OPCODE, playerActorID, targetActorID, Encoding.ASCII.GetBytes(name)); + return new SubPacket(OPCODE, sourceActorId, Encoding.ASCII.GetBytes(name)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs index 887acc94..a873d9e4 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs @@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public bool[] achievementFlags = new bool[1024]; - public SubPacket BuildPacket(uint playerActorID) + public SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs index f890e4e6..b6e131dc 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs @@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x01A4; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, uint jobId) + public static SubPacket BuildPacket(uint sourceActorId, uint jobId) { - return new SubPacket(OPCODE, sourceActorID, targetActorID, BitConverter.GetBytes((uint)jobId)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((uint)jobId)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs index 95f3ff97..401df44c 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs @@ -24,11 +24,11 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0197; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, int appearanceId) + public static SubPacket BuildPacket(uint sourceActorId, int appearanceId) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[5] = (byte)(appearanceId & 0xFF); - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs index 71aca97f..168ffd88 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs @@ -8,11 +8,11 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x01a0; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, int appearanceId) + public static SubPacket BuildPacket(uint sourceActorId, int appearanceId) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(appearanceId & 0xFF); - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs index 84bc4c9f..56aad084 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs @@ -62,7 +62,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public bool[] cutsceneFlags = new bool[2048]; - public SubPacket BuildPacket(uint playerActorID, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality) + public SubPacket BuildPacket(uint sourceActorId, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -91,7 +91,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs index d942efad..b4f120c9 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0194; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, ushort currentAllegiance, ushort rankLimsa, ushort rankGridania, ushort rankUldah) + public static SubPacket BuildPacket(uint sourceActorId, ushort currentAllegiance, ushort rankLimsa, ushort rankGridania, ushort rankUldah) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, sourceActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs index 796ac55e..9a72954d 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs @@ -7,11 +7,11 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0199; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, bool hasChocobo) + public static SubPacket BuildPacket(uint sourceActorId, bool hasChocobo) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(hasChocobo ? 1 : 0); - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs index 4f35e303..475bee38 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs @@ -7,11 +7,11 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x01A1; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, bool hasGoobbue) + public static SubPacket BuildPacket(uint sourceActorId, bool hasGoobbue) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(hasGoobbue ? 1 : 0); - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs index 5d9c6483..63fe48fc 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019B; public const uint PACKET_SIZE = 0x40; - public static SubPacket BuildPacket(uint playerActorID, uint[] latestAchievementIDs) + public static SubPacket BuildPacket(uint sourceActorId, uint[] latestAchievementIDs) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs index d3e3d177..3f2c4897 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs @@ -10,10 +10,10 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x01A7; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint dreamID) + public static SubPacket BuildPacket(uint sourceActorId, uint dreamID) { dreamID += 0x20E; - return new SubPacket(OPCODE, playerActorID, playerActorID, BitConverter.GetBytes((uint)dreamID)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((uint)dreamID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs index 675bf50d..0bda349f 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x01A5; public const uint PACKET_SIZE = 0x50; - public static SubPacket BuildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs index 75af7666..f99066c9 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs @@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019D; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint titleID) + public static SubPacket BuildPacket(uint sourceActorId, uint titleID) { - return new SubPacket(OPCODE, playerActorID, targetActorID, BitConverter.GetBytes((UInt64)titleID)); + return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((UInt64)titleID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetSpecialEventWorkPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetSpecialEventWorkPacket.cs index 78a8ed5e..93bd2644 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetSpecialEventWorkPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetSpecialEventWorkPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0196; public const uint PACKET_SIZE = 0x38; - public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) + public static SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, targetActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs index 2b3f7a4d..f777af29 100644 --- a/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs @@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment public const ushort OPCODE = 0x01C8; public const uint PACKET_SIZE = 0x218; - public static SubPacket BuildPacket(uint playerActorID, RecruitmentDetails details) + public static SubPacket BuildPacket(uint sourceActorId, RecruitmentDetails details) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -48,7 +48,7 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs index d6c6ffe6..4ce5d714 100644 --- a/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs +++ b/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs @@ -7,11 +7,11 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment public const ushort OPCODE = 0x01C4; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID) + public static SubPacket BuildPacket(uint sourceActorId) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = 1; - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs index 7356f33b..8bccd698 100644 --- a/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment public const ushort OPCODE = 0x01C5; public const uint PACKET_SIZE = 0x038; - public static SubPacket BuildPacket(uint playerActorID, bool isRecruiting, bool isRecruiter, long recruitmentId) + public static SubPacket BuildPacket(uint sourceActorId, bool isRecruiting, bool isRecruiter, long recruitmentId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs b/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs index efa1b644..9629575c 100644 --- a/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs +++ b/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs @@ -7,13 +7,13 @@ namespace FFXIVClassic_Map_Server.packets.send.recruitment public const ushort OPCODE = 0x01C3; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, bool success) + public static SubPacket BuildPacket(uint sourceActorId, bool success) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(success ? 0x1 : 0x0); - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs b/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs index 1ac85628..6cb39cdf 100644 --- a/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01C9; public const uint PACKET_SIZE = 0x048; - public static SubPacket BuildPacket(uint playerActorID, bool isSuccess, string nameToAdd) + public static SubPacket BuildPacket(uint sourceActorId, bool isSuccess, string nameToAdd) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs b/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs index 22c7f8a7..b341c5d4 100644 --- a/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CA; public const uint PACKET_SIZE = 0x048; - public static SubPacket BuildPacket(uint playerActorID, bool isSuccess, string nameToRemove) + public static SubPacket BuildPacket(uint sourceActorId, bool isSuccess, string nameToRemove) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs index a9e279fe..449a8873 100644 --- a/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CF; public const uint PACKET_SIZE = 0x686; - public static SubPacket BuildPacket(uint playerActorID, Tuple[] friendStatus) + public static SubPacket BuildPacket(uint sourceActorId, Tuple[] friendStatus) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs index b46caf85..6c7787a3 100644 --- a/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CC; public const uint PACKET_SIZE = 0x067; - public static SubPacket BuildPacket(uint playerActorID, bool isSuccess, long id, bool isOnline, string nameToAdd) + public static SubPacket BuildPacket(uint sourceActorId, bool isSuccess, long id, bool isOnline, string nameToAdd) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs index f293da3d..8e4d914c 100644 --- a/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CD; public const uint PACKET_SIZE = 0x057; - public static SubPacket BuildPacket(uint playerActorID, bool isSuccess, string nameToRemove) + public static SubPacket BuildPacket(uint sourceActorId, bool isSuccess, string nameToRemove) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs b/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs index 01654a86..9ddd35c3 100644 --- a/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CB; public const uint PACKET_SIZE = 0x686; - public static SubPacket BuildPacket(uint playerActorID, string[] blacklistedNames, ref int offset) + public static SubPacket BuildPacket(uint sourceActorId, string[] blacklistedNames, ref int offset) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs b/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs index 117c800e..b07b31f8 100644 --- a/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs +++ b/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social public const ushort OPCODE = 0x01CE; public const uint PACKET_SIZE = 0x686; - public static SubPacket BuildPacket(uint playerActorID, Tuple[] friends, ref int offset) + public static SubPacket BuildPacket(uint sourceActorId, Tuple[] friends, ref int offset) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -39,7 +39,7 @@ namespace FFXIVClassic_Map_Server.packets.send.social } } - return new SubPacket(OPCODE, playerActorID, playerActorID, data); + return new SubPacket(OPCODE, sourceActorId, data); } } }