Merge branch 'ai-open' into develop

# Conflicts:
#	FFXIVClassic Lobby Server/Database.cs
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/actors/chara/player/Inventory.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic World Server/Server.cs
This commit is contained in:
Filip Maj 2019-05-04 20:13:29 -04:00
commit 1e4a1cf263
402 changed files with 20078 additions and 1348 deletions

View file

@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.receive
{
public bool invalidPacket = false;
public uint actorID;
public uint otherVal; //Usually 0xE0000000
public uint attackTarget; //Usually 0xE0000000
public SetTargetPacket(byte[] data)
{
@ -17,7 +17,7 @@ namespace FFXIVClassic_Map_Server.packets.receive
{
try{
actorID = binReader.ReadUInt32();
otherVal = binReader.ReadUInt32();
attackTarget = binReader.ReadUInt32();
}
catch (Exception){
invalidPacket = true;