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 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai

Browse Source 
# Conflicts:
#	FFXIVClassic Map Server/actors/Actor.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
This commit is contained in:
Tahir Akhlaq
2017-07-08 04:10:36 +01:00
parent 247b5ca709 caf254fd95
commit 4695193aa0
235 changed files with 2840 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
}
}
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

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

@@ -2,8 +2,6 @@
using System;
using System.IO;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle
{
// see xtx_command
@@ -47,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
}
}
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

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

@@ -55,7 +55,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
}
}
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

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

@@ -55,7 +55,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
}
}
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}