cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Started removing all target actor id references.

Browse Source
This commit is contained in:
Filip Maj 2017-06-27 13:23:05 -04:00
parent c09471ed43
commit a264745207
64 changed files with 141 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FFXIVClassic Common Class Lib/SubPacket.cs
View File

@ -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);

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

@ -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;
}

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

@ -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<LuaParam> initParams)
public static SubPacket BuildPacket(uint sourceActorId, string objectName, string className, List<LuaParam> 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);
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}

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

@ -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);
}
}
}

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

@ -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]);
}
}
}

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

@ -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;
}

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

@ -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));
}
}
}

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

@ -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);
}
}

6
FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs
View File

@ -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);
}
}

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

@ -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;
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -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;
}

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

@ -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);
}
}

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

@ -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;
}

8
FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs
View File

@ -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);
}
}
}

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

@ -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));
}
}
}

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

@ -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;
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -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));
}
}
}

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

@ -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));
}
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/SetMusicPacket.cs
View File

@ -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));
}
}
}

4
FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs
View File

@ -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));
}
}
}

6
FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs
View File

@ -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);
}
}
}

8
FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs
View File

@ -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<LuaParam> luaParams)
public static SubPacket BuildPacket(uint sourcePlayerActorId, uint targetEventActorId, string conditionName, List<LuaParam> 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);
}
}

6
FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs
View File

@ -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<LuaParam> luaParams)
public static SubPacket BuildPacket(uint sourcePlayerActorId, uint eventOwnerActorID, string eventStarter, string callFunction, List<LuaParam> 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);
}
}
}

6
FFXIVClassic Map Server/packets/send/login/0x2Packet.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs
View File

@ -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)

4
FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs
View File

@ -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));
}
}
}

4
FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs
View File

@ -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<LuaParam> luaParams)
public static SubPacket BuildPacket(uint sourceActorId, List<LuaParam> 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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs
View File

@ -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));
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs
View File

@ -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));
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs
View File

@ -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);
}
}

4
FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs
View File

@ -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));
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs
View File

@ -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);
}
}

4
FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs
View File

@ -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);
}
}

4
FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs
View File

@ -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));
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs
View File

@ -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));
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetSpecialEventWorkPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs
View File

@ -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<long, bool>[] friendStatus)
public static SubPacket BuildPacket(uint sourceActorId, Tuple<long, bool>[] 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);
}
}
}

4
FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs
View File

@ -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);
}
}
}

4
FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs
View File

@ -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<long, string>[] friends, ref int offset)
public static SubPacket BuildPacket(uint sourceActorId, Tuple<long, string>[] 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);
}
}
}