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

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing

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

2
FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs
View File

@@ -2,7 +2,7 @@
{
class BattleAction
{
public uint targetId;
public uint tarGetId;
public ushort amount;
public ushort worldMasterTextId;
public uint effectId;

2
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs
View File

@@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
public const ushort OPCODE = 0x013C;
public const uint PACKET_SIZE = 0x48;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint targetActorId, uint animationId, ushort commandId)
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint tarGetActorId, uint animationId, ushort commandId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];

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

@@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
public const ushort OPCODE = 0x0139;
public const uint PACKET_SIZE = 0x58;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint targetActorId, uint animationId, uint effectId, ushort worldMasterTextId, ushort commandId, ushort amount, byte param)
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint tarGetActorId, uint animationId, uint effectId, ushort worldMasterTextId, ushort commandId, ushort amount, byte param)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
binWriter.Write((UInt16)commandId);
binWriter.Write((UInt16)810); //?
binWriter.Write((UInt32)targetActorId);
binWriter.Write((UInt32)tarGetActorId);
binWriter.Write((UInt16)amount);
binWriter.Write((UInt16)worldMasterTextId);

2
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs
View File

@@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
binWriter.Seek(0x20, SeekOrigin.Begin);
foreach (BattleAction action in actionList)
binWriter.Write((UInt32)action.targetId);
binWriter.Write((UInt32)action.tarGetId);
binWriter.Seek(0x50, SeekOrigin.Begin);
foreach (BattleAction action in actionList)

2
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs
View File

@@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
binWriter.Seek(0x58, SeekOrigin.Begin);
foreach (BattleAction action in actionList)
binWriter.Write((UInt32)action.targetId);
binWriter.Write((UInt32)action.tarGetId);
binWriter.Seek(0xA0, SeekOrigin.Begin);
foreach (BattleAction action in actionList)