mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-21 20:27:47 +00:00
Code Activity

Moved packet structures to common.

Browse source
This commit is contained in:
Filip Maj 2016-08-22 10:43:04 -04:00
parent d5f0cbef8c
commit c67f74130f
169 changed files with 3939 additions and 919 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
FFXIVClassic Map Server/packets/BasePacket.cs → FFXIVClassic Common Class Lib/BasePacket.cs
View file

@ -3,11 +3,10 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using FFXIVClassic.Common;
using NLog; using NLog;
using NLog.Targets; using NLog.Targets;
namespace FFXIVClassic_Map_Server.packets namespace FFXIVClassic.Common
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct BasePacketHeader public struct BasePacketHeader

2
FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj
View file

@ -54,12 +54,14 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="BasePacket.cs" />
<Compile Include="Bitfield.cs" /> <Compile Include="Bitfield.cs" />
<Compile Include="Blowfish.cs" /> <Compile Include="Blowfish.cs" />
<Compile Include="EfficientHashTables.cs" /> <Compile Include="EfficientHashTables.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Sql.cs" /> <Compile Include="Sql.cs" />
<Compile Include="STA_INIFile.cs" /> <Compile Include="STA_INIFile.cs" />
<Compile Include="SubPacket.cs" />
<Compile Include="Utils.cs" /> <Compile Include="Utils.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
FFXIVClassic Map Server/packets/SubPacket.cs → FFXIVClassic Common Class Lib/SubPacket.cs
View file

@ -4,7 +4,7 @@ using FFXIVClassic.Common;
using NLog; using NLog;
using NLog.Targets; using NLog.Targets;
namespace FFXIVClassic_Map_Server.packets namespace FFXIVClassic.Common
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct SubPacketHeader public struct SubPacketHeader

1
FFXIVClassic Lobby Server/ClientConnection.cs
View file

@ -1,6 +1,5 @@
using System; using System;
using System.Net.Sockets; using System.Net.Sockets;
using FFXIVClassic_Lobby_Server.packets;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using Cyotek.Collections.Generic; using Cyotek.Collections.Generic;

2
FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj
View file

@ -89,7 +89,6 @@
<Compile Include="Database.cs" /> <Compile Include="Database.cs" />
<Compile Include="dataobjects\World.cs" /> <Compile Include="dataobjects\World.cs" />
<Compile Include="PacketProcessor.cs" /> <Compile Include="PacketProcessor.cs" />
<Compile Include="packets\BasePacket.cs" />
<Compile Include="packets\receive\CharacterModifyPacket.cs" /> <Compile Include="packets\receive\CharacterModifyPacket.cs" />
<Compile Include="packets\receive\SecurityHandshakePacket.cs" /> <Compile Include="packets\receive\SecurityHandshakePacket.cs" />
<Compile Include="packets\receive\SelectCharacterPacket.cs" /> <Compile Include="packets\receive\SelectCharacterPacket.cs" />
@ -99,7 +98,6 @@
<Compile Include="packets\send\ErrorPacket.cs" /> <Compile Include="packets\send\ErrorPacket.cs" />
<Compile Include="packets\HardCoded_Packets.cs" /> <Compile Include="packets\HardCoded_Packets.cs" />
<Compile Include="packets\send\SelectCharacterConfirmPacket.cs" /> <Compile Include="packets\send\SelectCharacterConfirmPacket.cs" />
<Compile Include="packets\SubPacket.cs" />
<Compile Include="packets\send\CharacterListPacket.cs" /> <Compile Include="packets\send\CharacterListPacket.cs" />
<Compile Include="packets\send\ImportListPacket.cs" /> <Compile Include="packets\send\ImportListPacket.cs" />
<Compile Include="packets\send\AccountListPacket.cs" /> <Compile Include="packets\send\AccountListPacket.cs" />

2
FFXIVClassic Lobby Server/Server.cs
View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using FFXIVClassic_Lobby_Server.packets;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using NLog; using NLog;

361
FFXIVClassic Lobby Server/packets/BasePacket.cs
View file

@ -1,361 +0,0 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using FFXIVClassic.Common;
using NLog;
using NLog.Targets;
namespace FFXIVClassic_Lobby_Server.packets
{
[StructLayout(LayoutKind.Sequential)]
public struct BasePacketHeader
{
public byte isAuthenticated;
public byte isEncrypted;
public ushort connectionType;
public ushort packetSize;
public ushort numSubpackets;
public ulong timestamp; //Miliseconds
}
public class BasePacket
{
public const int TYPE_ZONE = 1;
public const int TYPE_CHAT = 2;
public const int BASEPACKET_SIZE = 0x10;
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
public byte[] data;
public BasePacketHeader header;
//Loads a sniffed packet from a file
public unsafe BasePacket(string path)
{
var bytes = File.ReadAllBytes(path);
if (bytes.Length < BASEPACKET_SIZE)
throw new OverflowException("Packet Error: Packet was too small");
fixed (byte* pdata = &bytes[0])
{
header = (BasePacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(BasePacketHeader));
}
if (bytes.Length < header.packetSize)
throw new OverflowException("Packet Error: Packet size didn't equal given size");
int packetSize = header.packetSize;
if (packetSize - BASEPACKET_SIZE != 0)
{
data = new byte[packetSize - BASEPACKET_SIZE];
Array.Copy(bytes, BASEPACKET_SIZE, data, 0, packetSize - BASEPACKET_SIZE);
}
else
data = new byte[0];
}
//Loads a sniffed packet from a byte array
public unsafe BasePacket(byte[] bytes)
{
if (bytes.Length < BASEPACKET_SIZE)
throw new OverflowException("Packet Error: Packet was too small");
fixed (byte* pdata = &bytes[0])
{
header = (BasePacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(BasePacketHeader));
}
if (bytes.Length < header.packetSize)
throw new OverflowException("Packet Error: Packet size didn't equal given size");
int packetSize = header.packetSize;
data = new byte[packetSize - BASEPACKET_SIZE];
Array.Copy(bytes, BASEPACKET_SIZE, data, 0, packetSize - BASEPACKET_SIZE);
}
public unsafe BasePacket(byte[] bytes, ref int offset)
{
if (bytes.Length < offset + BASEPACKET_SIZE)
throw new OverflowException("Packet Error: Packet was too small");
fixed (byte* pdata = &bytes[offset])
{
header = (BasePacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(BasePacketHeader));
}
int packetSize = header.packetSize;
if (bytes.Length < offset + header.packetSize)
throw new OverflowException("Packet Error: Packet size didn't equal given size");
data = new byte[packetSize - BASEPACKET_SIZE];
Array.Copy(bytes, offset + BASEPACKET_SIZE, data, 0, packetSize - BASEPACKET_SIZE);
offset += packetSize;
}
public BasePacket(BasePacketHeader header, byte[] data)
{
this.header = header;
this.data = data;
}
public List<SubPacket> GetSubpackets()
{
var subpackets = new List<SubPacket>(header.numSubpackets);
var offset = 0;
while (offset < data.Length)
subpackets.Add(new SubPacket(data, ref offset));
return subpackets;
}
public static unsafe BasePacketHeader GetHeader(byte[] bytes)
{
BasePacketHeader header;
if (bytes.Length < BASEPACKET_SIZE)
throw new OverflowException("Packet Error: Packet was too small");
fixed (byte* pdata = &bytes[0])
{
header = (BasePacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(BasePacketHeader));
}
return header;
}
public byte[] GetHeaderBytes()
{
var size = Marshal.SizeOf(header);
var arr = new byte[size];
var ptr = Marshal.AllocHGlobal(size);
Marshal.StructureToPtr(header, ptr, true);
Marshal.Copy(ptr, arr, 0, size);
Marshal.FreeHGlobal(ptr);
return arr;
}
public byte[] GetPacketBytes()
{
var outBytes = new byte[header.packetSize];
Array.Copy(GetHeaderBytes(), 0, outBytes, 0, BASEPACKET_SIZE);
Array.Copy(data, 0, outBytes, BASEPACKET_SIZE, data.Length);
return outBytes;
}
//Replaces all instances of the sniffed actorID with the given one
public void ReplaceActorID(uint actorID)
{
using (var mem = new MemoryStream(data))
{
using (var binWriter = new BinaryWriter(mem))
{
using (var binreader = new BinaryReader(mem))
{
while (binreader.BaseStream.Position + 4 < data.Length)
{
var read = binreader.ReadUInt32();
if (read == 0x029B2941 || read == 0x02977DC7 || read == 0x0297D2C8 || read == 0x0230d573 ||
read == 0x23317df || read == 0x23344a3 || read == 0x1730bdb) //Original ID
{
binWriter.BaseStream.Seek(binreader.BaseStream.Position - 0x4, SeekOrigin.Begin);
binWriter.Write(actorID);
}
}
}
}
}
}
//Replaces all instances of the sniffed actorID with the given one
public void ReplaceActorID(uint fromActorID, uint actorID)
{
using (var mem = new MemoryStream(data))
{
using (var binWriter = new BinaryWriter(mem))
{
using (var binreader = new BinaryReader(mem))
{
while (binreader.BaseStream.Position + 4 < data.Length)
{
var read = binreader.ReadUInt32();
if (read == fromActorID) //Original ID
{
binWriter.BaseStream.Seek(binreader.BaseStream.Position - 0x4, SeekOrigin.Begin);
binWriter.Write(actorID);
}
}
}
}
}
}
public void DebugPrintPacket()
{
#if DEBUG
logger.ColorDebug(
string.Format("IsAuth:{0} Size:0x{1:X}, NumSubpackets:{2}{3}{4}",
header.isAuthenticated, header.packetSize, header.numSubpackets,
Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes())), ConsoleOutputColor.DarkYellow);
foreach (var sub in GetSubpackets())
{
sub.DebugPrintSubPacket();
}
#endif
}
#region Utility Functions
public static BasePacket CreatePacket(List<SubPacket> subpackets, bool isAuthed, bool isEncrypted)
{
//Create Header
var header = new BasePacketHeader();
byte[] data = null;
header.isAuthenticated = isAuthed ? (byte) 1 : (byte) 0;
header.isEncrypted = isEncrypted ? (byte) 1 : (byte) 0;
header.numSubpackets = (ushort) subpackets.Count;
header.packetSize = BASEPACKET_SIZE;
header.timestamp = Utils.MilisUnixTimeStampUTC();
//Get packet size
foreach (var subpacket in subpackets)
header.packetSize += subpacket.header.subpacketSize;
data = new byte[header.packetSize - 0x10];
//Add Subpackets
var offset = 0;
foreach (var subpacket in subpackets)
{
var subpacketData = subpacket.GetBytes();
Array.Copy(subpacketData, 0, data, offset, subpacketData.Length);
offset += (ushort) subpacketData.Length;
}
Debug.Assert(data != null && offset == data.Length && header.packetSize == 0x10 + offset);
var packet = new BasePacket(header, data);
return packet;
}
public static BasePacket CreatePacket(SubPacket subpacket, bool isAuthed, bool isEncrypted)
{
//Create Header
var header = new BasePacketHeader();
byte[] data = null;
header.isAuthenticated = isAuthed ? (byte) 1 : (byte) 0;
header.isEncrypted = isEncrypted ? (byte) 1 : (byte) 0;
header.numSubpackets = 1;
header.packetSize = BASEPACKET_SIZE;
header.timestamp = Utils.MilisUnixTimeStampUTC();
//Get packet size
header.packetSize += subpacket.header.subpacketSize;
data = new byte[header.packetSize - 0x10];
//Add Subpackets
var subpacketData = subpacket.GetBytes();
Array.Copy(subpacketData, 0, data, 0, subpacketData.Length);
Debug.Assert(data != null);
var packet = new BasePacket(header, data);
return packet;
}
public static BasePacket CreatePacket(byte[] data, bool isAuthed, bool isEncrypted)
{
Debug.Assert(data != null);
//Create Header
var header = new BasePacketHeader();
header.isAuthenticated = isAuthed ? (byte) 1 : (byte) 0;
header.isEncrypted = isEncrypted ? (byte) 1 : (byte) 0;
header.numSubpackets = 1;
header.packetSize = BASEPACKET_SIZE;
header.timestamp = Utils.MilisUnixTimeStampUTC();
//Get packet size
header.packetSize += (ushort) data.Length;
var packet = new BasePacket(header, data);
return packet;
}
public static unsafe void EncryptPacket(Blowfish blowfish, BasePacket packet)
{
var data = packet.data;
int size = packet.header.packetSize;
var offset = 0;
while (offset < data.Length)
{
if (data.Length < offset + SubPacket.SUBPACKET_SIZE)
throw new OverflowException("Packet Error: Subpacket was too small");
SubPacketHeader header;
fixed (byte* pdata = &data[offset])
{
header = (SubPacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(SubPacketHeader));
}
if (data.Length < offset + header.subpacketSize)
throw new OverflowException("Packet Error: Subpacket size didn't equal subpacket data");
blowfish.Encipher(data, offset + 0x10, header.subpacketSize - 0x10);
offset += header.subpacketSize;
}
}
public static unsafe void DecryptPacket(Blowfish blowfish, ref BasePacket packet)
{
var data = packet.data;
int size = packet.header.packetSize;
var offset = 0;
while (offset < data.Length)
{
if (data.Length < offset + SubPacket.SUBPACKET_SIZE)
throw new OverflowException("Packet Error: Subpacket was too small");
SubPacketHeader header;
fixed (byte* pdata = &data[offset])
{
header = (SubPacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(SubPacketHeader));
}
if (data.Length < offset + header.subpacketSize)
throw new OverflowException("Packet Error: Subpacket size didn't equal subpacket data");
blowfish.Decipher(data, offset + 0x10, header.subpacketSize - 0x10);
offset += header.subpacketSize;
}
}
#endregion
}
public static class LoggerExtensions
{
public static void ColorDebug(this Logger logger, string message, ConsoleOutputColor color)
{
var logEvent = new LogEventInfo(LogLevel.Debug, logger.Name, message);
logEvent.Properties["color"] = (int) color;
logger.Log(logEvent);
}
}
}

163
FFXIVClassic Lobby Server/packets/SubPacket.cs
View file

@ -1,163 +0,0 @@
using System;
using System.Runtime.InteropServices;
using FFXIVClassic.Common;
using NLog;
using NLog.Targets;
namespace FFXIVClassic_Lobby_Server.packets
{
[StructLayout(LayoutKind.Sequential)]
public struct SubPacketHeader
{
public ushort subpacketSize;
public ushort type;
public uint sourceId;
public uint targetId;
public uint unknown1;
}
[StructLayout(LayoutKind.Sequential)]
public struct GameMessageHeader
{
public ushort unknown4; //Always 0x14
public ushort opcode;
public uint unknown5;
public uint timestamp;
public uint unknown6;
}
public class SubPacket
{
public const int SUBPACKET_SIZE = 0x10;
public const int GAMEMESSAGE_SIZE = 0x10;
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
public byte[] data;
public GameMessageHeader gameMessage;
public SubPacketHeader header;
public unsafe SubPacket(byte[] bytes, ref int offset)
{
if (bytes.Length < offset + SUBPACKET_SIZE)
throw new OverflowException("Packet Error: Subpacket was too small");
fixed (byte* pdata = &bytes[offset])
{
header = (SubPacketHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(SubPacketHeader));
}
if (header.type == 0x3)
{
fixed (byte* pdata = &bytes[offset + SUBPACKET_SIZE])
{
gameMessage =
(GameMessageHeader) Marshal.PtrToStructure(new IntPtr(pdata), typeof(GameMessageHeader));
}
}
if (bytes.Length < offset + header.subpacketSize)
throw new OverflowException("Packet Error: Subpacket size didn't equal subpacket data");
if (header.type == 0x3)
{
data = new byte[header.subpacketSize - SUBPACKET_SIZE - GAMEMESSAGE_SIZE];
Array.Copy(bytes, offset + SUBPACKET_SIZE + GAMEMESSAGE_SIZE, data, 0, data.Length);
}
else
{
data = new byte[header.subpacketSize - SUBPACKET_SIZE];
Array.Copy(bytes, offset + SUBPACKET_SIZE, data, 0, data.Length);
}
offset += header.subpacketSize;
}
public SubPacket(ushort opcode, uint sourceId, uint targetId, byte[] data)
{
header = new SubPacketHeader();
gameMessage = new GameMessageHeader();
gameMessage.opcode = opcode;
header.sourceId = sourceId;
header.targetId = targetId;
gameMessage.timestamp = Utils.UnixTimeStampUTC();
header.type = 0x03;
header.unknown1 = 0x00;
gameMessage.unknown4 = 0x14;
gameMessage.unknown5 = 0x00;
gameMessage.unknown6 = 0x00;
this.data = data;
header.subpacketSize = (ushort) (SUBPACKET_SIZE + GAMEMESSAGE_SIZE + data.Length);
}
public SubPacket(SubPacket original, uint newTargetId)
{
header = new SubPacketHeader();
gameMessage = original.gameMessage;
header.subpacketSize = original.header.subpacketSize;
header.type = original.header.type;
header.sourceId = original.header.sourceId;
header.targetId = newTargetId;
data = original.data;
}
public byte[] GetHeaderBytes()
{
var size = Marshal.SizeOf(header);
var arr = new byte[size];
var ptr = Marshal.AllocHGlobal(size);
Marshal.StructureToPtr(header, ptr, true);
Marshal.Copy(ptr, arr, 0, size);
Marshal.FreeHGlobal(ptr);
return arr;
}
public byte[] GetGameMessageBytes()
{
var size = Marshal.SizeOf(gameMessage);
var arr = new byte[size];
var ptr = Marshal.AllocHGlobal(size);
Marshal.StructureToPtr(gameMessage, ptr, true);
Marshal.Copy(ptr, arr, 0, size);
Marshal.FreeHGlobal(ptr);
return arr;
}
public byte[] GetBytes()
{
var outBytes = new byte[header.subpacketSize];
Array.Copy(GetHeaderBytes(), 0, outBytes, 0, SUBPACKET_SIZE);
if (header.type == 0x3)
Array.Copy(GetGameMessageBytes(), 0, outBytes, SUBPACKET_SIZE, GAMEMESSAGE_SIZE);
Array.Copy(data, 0, outBytes, SUBPACKET_SIZE + (header.type == 0x3 ? GAMEMESSAGE_SIZE : 0), data.Length);
return outBytes;
}
public void DebugPrintSubPacket()
{
#if DEBUG
logger.ColorDebug(
string.Format("Size:0x{0:X} Opcode:0x{1:X}{2}{3}", header.subpacketSize, gameMessage.opcode,
Environment.NewLine,
Utils.ByteArrayToHex(GetHeaderBytes())), ConsoleOutputColor.DarkRed);
if (header.type == 0x03)
{
logger.ColorDebug(Utils.ByteArrayToHex(GetGameMessageBytes(), SUBPACKET_SIZE),
ConsoleOutputColor.DarkRed);
logger.ColorDebug(Utils.ByteArrayToHex(data, SUBPACKET_SIZE + GAMEMESSAGE_SIZE),
ConsoleOutputColor.DarkMagenta);
}
#endif
}
}
}

3
FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Lobby_Server.dataobjects; using FFXIVClassic.Common;
using FFXIVClassic_Lobby_Server.dataobjects;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;

3
FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs
View file

@ -1,4 +1,5 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
using System.Text; using System.Text;

3
FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Lobby_Server.dataobjects; using FFXIVClassic.Common;
using FFXIVClassic_Lobby_Server.dataobjects;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;

3
FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs
View file

@ -1,4 +1,5 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
using System.Text; using System.Text;

3
FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs
View file

@ -1,4 +1,5 @@
using System; using FFXIVClassic.Common;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;

3
FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs
View file

@ -1,4 +1,5 @@
using System; using FFXIVClassic.Common;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;

3
FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs
View file

@ -1,4 +1,5 @@
using System; using FFXIVClassic.Common;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;

3
FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Lobby_Server.dataobjects; using FFXIVClassic.Common;
using FFXIVClassic_Lobby_Server.dataobjects;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;

2
FFXIVClassic Map Server/ClientConnection.cs
View file

@ -1,6 +1,6 @@
using System; using System;
using System.Net.Sockets; using System.Net.Sockets;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Net; using System.Net;

2
FFXIVClassic Map Server/CommandProcessor.cs
View file

@ -8,7 +8,7 @@ using System.Threading.Tasks;
using System.Threading; using System.Threading;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.packets;
using System.IO; using System.IO;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;
using FFXIVClassic_Map_Server; using FFXIVClassic_Map_Server;

2
FFXIVClassic Map Server/Database.cs
View file

@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.utils; using FFXIVClassic_Map_Server.utils;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic_Map_Server.packets.send.player; using FFXIVClassic_Map_Server.packets.send.player;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;

2
FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
View file

@ -121,7 +121,6 @@
<Compile Include="lua\LuaPlayer.cs" /> <Compile Include="lua\LuaPlayer.cs" />
<Compile Include="lua\LuaScript.cs" /> <Compile Include="lua\LuaScript.cs" />
<Compile Include="PacketProcessor.cs" /> <Compile Include="PacketProcessor.cs" />
<Compile Include="packets\BasePacket.cs" />
<Compile Include="packets\receive\ChatMessagePacket.cs" /> <Compile Include="packets\receive\ChatMessagePacket.cs" />
<Compile Include="packets\receive\events\EventUpdatePacket.cs" /> <Compile Include="packets\receive\events\EventUpdatePacket.cs" />
<Compile Include="packets\receive\events\EventStartPacket.cs" /> <Compile Include="packets\receive\events\EventStartPacket.cs" />
@ -255,7 +254,6 @@
<Compile Include="packets\send\_0x02Packet.cs" /> <Compile Include="packets\send\_0x02Packet.cs" />
<Compile Include="packets\send\_0x10Packet.cs" /> <Compile Include="packets\send\_0x10Packet.cs" />
<Compile Include="packets\send\_0xE2Packet.cs" /> <Compile Include="packets\send\_0xE2Packet.cs" />
<Compile Include="packets\SubPacket.cs" />
<Compile Include="packets\receive\PingPacket.cs" /> <Compile Include="packets\receive\PingPacket.cs" />
<Compile Include="packets\receive\UpdatePlayerPositionPacket.cs" /> <Compile Include="packets\receive\UpdatePlayerPositionPacket.cs" />
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />

2
FFXIVClassic Map Server/PacketProcessor.cs
View file

@ -1,5 +1,5 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.packets;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;

2
FFXIVClassic Map Server/Server.cs
View file

@ -4,7 +4,7 @@ using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using NLog; using NLog;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;

2
FFXIVClassic Map Server/actors/Actor.cs
View file

@ -1,4 +1,4 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic_Map_Server.actors; using FFXIVClassic_Map_Server.actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

2
FFXIVClassic Map Server/actors/area/Area.cs
View file

@ -1,6 +1,6 @@
using FFXIVClassic_Map_Server; using FFXIVClassic_Map_Server;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic_Map_Server.actors.area; using FFXIVClassic_Map_Server.actors.area;
using FFXIVClassic_Map_Server.actors.chara.npc; using FFXIVClassic_Map_Server.actors.chara.npc;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;

3
FFXIVClassic Map Server/actors/area/PrivateArea.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

2
FFXIVClassic Map Server/actors/area/Zone.cs
View file

@ -1,6 +1,6 @@
using FFXIVClassic_Map_Server; using FFXIVClassic_Map_Server;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic_Map_Server.actors.chara.npc; using FFXIVClassic_Map_Server.actors.chara.npc;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;

3
FFXIVClassic Map Server/actors/chara/Character.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors.Chara; using FFXIVClassic_Map_Server.Actors.Chara;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

2
FFXIVClassic Map Server/actors/chara/npc/Npc.cs
View file

@ -3,7 +3,7 @@ using FFXIVClassic_Map_Server.actors;
using FFXIVClassic_Map_Server.Actors.Chara; using FFXIVClassic_Map_Server.Actors.Chara;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic_Map_Server.packets.receive.events; using FFXIVClassic_Map_Server.packets.receive.events;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;
using FFXIVClassic_Map_Server.utils; using FFXIVClassic_Map_Server.utils;

1
FFXIVClassic Map Server/actors/chara/player/Equipment.cs
View file

@ -1,7 +1,6 @@
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.packets.send.actor.inventory; using FFXIVClassic_Map_Server.packets.send.actor.inventory;
using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
using System.Collections.Generic; using System.Collections.Generic;
namespace FFXIVClassic_Map_Server.actors.chara.player namespace FFXIVClassic_Map_Server.actors.chara.player

4
FFXIVClassic Map Server/actors/chara/player/Inventory.cs
View file

@ -1,8 +1,8 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.packets.send.actor.inventory; using FFXIVClassic_Map_Server.packets.send.actor.inventory;
using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

7
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -1,5 +1,5 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic_Map_Server.actors.chara.player; using FFXIVClassic_Map_Server.actors.chara.player;
using FFXIVClassic_Map_Server.actors.director; using FFXIVClassic_Map_Server.actors.director;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
@ -7,8 +7,6 @@ using FFXIVClassic_Map_Server.dataobjects.chara;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send; using FFXIVClassic_Map_Server.packets.send;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;
using FFXIVClassic_Map_Server.packets.send.actor.events;
using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
using FFXIVClassic_Map_Server.packets.send.events; using FFXIVClassic_Map_Server.packets.send.events;
using FFXIVClassic_Map_Server.packets.send.list; using FFXIVClassic_Map_Server.packets.send.list;
using FFXIVClassic_Map_Server.packets.send.player; using FFXIVClassic_Map_Server.packets.send.player;
@ -17,7 +15,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using MoonSharp.Interpreter; using MoonSharp.Interpreter;
using FFXIVClassic_Map_Server.packets.receive.events; using FFXIVClassic_Map_Server.packets.receive.events;
using FFXIVClassic_Map_Server.packets.send.actor.inventory;
namespace FFXIVClassic_Map_Server.Actors namespace FFXIVClassic_Map_Server.Actors
{ {
class Player : Character class Player : Character

2
FFXIVClassic Map Server/actors/debug/Debug.cs
View file

@ -1,4 +1,4 @@
using FFXIVClassic_Map_Server.packets; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;
using System.Collections.Generic; using System.Collections.Generic;

3
FFXIVClassic Map Server/actors/director/Director.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

3
FFXIVClassic Map Server/actors/director/OpeningDirector.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

3
FFXIVClassic Map Server/actors/director/WeatherDirector.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.actors.director; using FFXIVClassic_Map_Server.actors.director;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

3
FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

3
FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

3
FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

3
FFXIVClassic Map Server/actors/world/WorldMaster.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;
using System.Collections.Generic; using System.Collections.Generic;

4
FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
View file

@ -1,6 +1,6 @@
using FFXIVClassic_Map_Server; using FFXIVClassic_Map_Server;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;
@ -70,7 +70,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
} }
public void QueuePacket(SubPacket subPacket, bool isAuthed, bool isEncrypted) public void QueuePacket(SubPacket subPacket, bool isAuthed, bool isEncrypted)
{ {
zoneConnection.QueuePacket(subPacket, isAuthed, isEncrypted); zoneConnection.QueuePacket(subPacket, isAuthed, isEncrypted);
} }

527
FFXIVClassic Map Server/lua/LuaEngine.cs
View file

@ -1,207 +1,208 @@
using FFXIVClassic_Map_Server.packets; 
using FFXIVClassic_Map_Server.actors.director; using FFXIVClassic_Map_Server.actors.director;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.packets.receive.events; using FFXIVClassic_Map_Server.packets.receive.events;
using FFXIVClassic_Map_Server.packets.send; using FFXIVClassic_Map_Server.packets.send;
using FFXIVClassic_Map_Server.packets.send.events; using FFXIVClassic_Map_Server.packets.send.events;
using MoonSharp.Interpreter; using MoonSharp.Interpreter;
using MoonSharp.Interpreter.Interop; using MoonSharp.Interpreter.Interop;
using MoonSharp.Interpreter.Loaders; using MoonSharp.Interpreter.Loaders;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Diagnostics; using System.Diagnostics;
using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.lua
{ namespace FFXIVClassic_Map_Server.lua
class LuaEngine {
{ class LuaEngine
const string FILEPATH_PLAYER = "./scripts/player.lua"; {
const string FILEPATH_ZONE = "./scripts/zones/{0}/zone.lua"; const string FILEPATH_PLAYER = "./scripts/player.lua";
const string FILEPATH_COMMANDS = "./scripts/commands/{0}.lua"; const string FILEPATH_ZONE = "./scripts/zones/{0}/zone.lua";
const string FILEPATH_DIRECTORS = "./scripts/directors/{0}.lua"; const string FILEPATH_COMMANDS = "./scripts/commands/{0}.lua";
const string FILEPATH_NPCS = "./scripts/zones/{0}/npcs/{1}.lua"; const string FILEPATH_DIRECTORS = "./scripts/directors/{0}.lua";
const string FILEPATH_NPCS = "./scripts/zones/{0}/npcs/{1}.lua";
public LuaEngine()
{ public LuaEngine()
UserData.RegistrationPolicy = InteropRegistrationPolicy.Automatic; {
} UserData.RegistrationPolicy = InteropRegistrationPolicy.Automatic;
public static List<LuaParam> DoActorInstantiate(Player player, Actor target)
{
string luaPath;
if (target is Npc)
{
luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName());
if (File.Exists(luaPath))
{
LuaScript script = LoadScript(luaPath);
if (script == null)
return null;
DynValue result = script.Call(script.Globals["init"], target);
List<LuaParam> lparams = LuaUtils.CreateLuaParamList(result);
return lparams;
}
else
{
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
return null;
}
}
return null;
} }
public static Coroutine DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart) public static List<LuaParam> DoActorInstantiate(Player player, Actor target)
{ {
string luaPath; string luaPath;
if (target is Command) if (target is Npc)
{ {
luaPath = String.Format(FILEPATH_COMMANDS, target.GetName()); luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName());
} if (File.Exists(luaPath))
else if (target is Director) {
{ LuaScript script = LoadScript(luaPath);
luaPath = String.Format(FILEPATH_DIRECTORS, target.GetName());
} if (script == null)
else return null;
luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName());
DynValue result = script.Call(script.Globals["init"], target);
if (File.Exists(luaPath)) List<LuaParam> lparams = LuaUtils.CreateLuaParamList(result);
{ return lparams;
LuaScript script = LoadScript(luaPath); }
else
if (script == null) {
return null; SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
return null;
if (!script.Globals.Get("onEventStarted").IsNil()) }
return script.CreateCoroutine(script.Globals["onEventStarted"]).Coroutine;
else
return null;
}
else
{
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
return null;
} }
} return null;
}
public static void DoActorOnSpawn(Player player, Npc target)
{ public static Coroutine DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart)
string luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); {
if (File.Exists(luaPath))
{
LuaScript script = LoadScript(luaPath);
if (script == null)
return;
//Run Script
if (!script.Globals.Get("onSpawn").IsNil())
script.Call(script.Globals["onSpawn"], player, target);
}
else
{
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
}
}
public static void DoActorOnEventUpdated(Player player, Actor target, EventUpdatePacket eventUpdate)
{
if (target is Npc)
{
((Npc)target).DoEventUpdate(player, eventUpdate);
return;
}
string luaPath; string luaPath;
if (target is Command) if (target is Command)
luaPath = String.Format(FILEPATH_COMMANDS, target.GetName()); {
else if (target is Director) luaPath = String.Format(FILEPATH_COMMANDS, target.GetName());
luaPath = String.Format(FILEPATH_DIRECTORS, target.GetName());
else
luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName());
if (File.Exists(luaPath))
{
LuaScript script = LoadScript(luaPath);
if (script == null)
return;
//Have to Do this to combine LuaParams
List<Object> objects = new List<Object>();
objects.Add(player);
objects.Add(target);
objects.Add(eventUpdate.val2);
objects.AddRange(LuaUtils.CreateLuaParamObjectList(eventUpdate.luaParams));
//Run Script
if (!script.Globals.Get("onEventUpdate").IsNil())
script.Call(script.Globals["onEventUpdate"], objects.ToArray());
}
else
{
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
} }
} else if (target is Director)
{
public static void OnZoneIn(Player player) luaPath = String.Format(FILEPATH_DIRECTORS, target.GetName());
{ }
else
luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName());
if (File.Exists(luaPath))
{
LuaScript script = LoadScript(luaPath);
if (script == null)
return null;
if (!script.Globals.Get("onEventStarted").IsNil())
return script.CreateCoroutine(script.Globals["onEventStarted"]).Coroutine;
else
return null;
}
else
{
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
return null;
}
}
public static void DoActorOnSpawn(Player player, Npc target)
{
string luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName());
if (File.Exists(luaPath))
{
LuaScript script = LoadScript(luaPath);
if (script == null)
return;
//Run Script
if (!script.Globals.Get("onSpawn").IsNil())
script.Call(script.Globals["onSpawn"], player, target);
}
else
{
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
}
}
public static void DoActorOnEventUpdated(Player player, Actor target, EventUpdatePacket eventUpdate)
{
if (target is Npc)
{
((Npc)target).DoEventUpdate(player, eventUpdate);
return;
}
string luaPath;
if (target is Command)
luaPath = String.Format(FILEPATH_COMMANDS, target.GetName());
else if (target is Director)
luaPath = String.Format(FILEPATH_DIRECTORS, target.GetName());
else
luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName());
if (File.Exists(luaPath))
{
LuaScript script = LoadScript(luaPath);
if (script == null)
return;
//Have to Do this to combine LuaParams
List<Object> objects = new List<Object>();
objects.Add(player);
objects.Add(target);
objects.Add(eventUpdate.val2);
objects.AddRange(LuaUtils.CreateLuaParamObjectList(eventUpdate.luaParams));
//Run Script
if (!script.Globals.Get("onEventUpdate").IsNil())
script.Call(script.Globals["onEventUpdate"], objects.ToArray());
}
else
{
SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName()));
}
}
public static void OnZoneIn(Player player)
{
string luaPath = String.Format(FILEPATH_ZONE, player.GetZone().actorId); string luaPath = String.Format(FILEPATH_ZONE, player.GetZone().actorId);
if (File.Exists(luaPath)) if (File.Exists(luaPath))
{ {
LuaScript script = LoadScript(luaPath); LuaScript script = LoadScript(luaPath);
if (script == null) if (script == null)
return; return;
//Run Script //Run Script
if (!script.Globals.Get("onZoneIn").IsNil()) if (!script.Globals.Get("onZoneIn").IsNil())
script.Call(script.Globals["onZoneIn"], player); script.Call(script.Globals["onZoneIn"], player);
} }
} }
public static void OnBeginLogin(Player player) public static void OnBeginLogin(Player player)
{ {
if (File.Exists(FILEPATH_PLAYER)) if (File.Exists(FILEPATH_PLAYER))
{ {
LuaScript script = LoadScript(FILEPATH_PLAYER); LuaScript script = LoadScript(FILEPATH_PLAYER);
if (script == null) if (script == null)
return; return;
//Run Script //Run Script
if (!script.Globals.Get("onBeginLogin").IsNil()) if (!script.Globals.Get("onBeginLogin").IsNil())
script.Call(script.Globals["onBeginLogin"], player); script.Call(script.Globals["onBeginLogin"], player);
} }
} }
public static void OnLogin(Player player) public static void OnLogin(Player player)
{ {
if (File.Exists(FILEPATH_PLAYER)) if (File.Exists(FILEPATH_PLAYER))
{ {
LuaScript script = LoadScript(FILEPATH_PLAYER); LuaScript script = LoadScript(FILEPATH_PLAYER);
if (script == null) if (script == null)
return; return;
//Run Script //Run Script
if (!script.Globals.Get("onLogin").IsNil()) if (!script.Globals.Get("onLogin").IsNil())
script.Call(script.Globals["onLogin"], player); script.Call(script.Globals["onLogin"], player);
} }
} }
#region RunGMCommand #region RunGMCommand
public static void RunGMCommand(Player player, String cmd, string[] param, bool help = false) public static void RunGMCommand(Player player, String cmd, string[] param, bool help = false)
{ {
@ -336,22 +337,22 @@ namespace FFXIVClassic_Map_Server.lua
LuaScript.Log.Error("LuaEngine.RunGMCommand: Unable to find script {0}", path); LuaScript.Log.Error("LuaEngine.RunGMCommand: Unable to find script {0}", path);
return; return;
} }
#endregion #endregion
public static LuaScript LoadScript(string filename) public static LuaScript LoadScript(string filename)
{ {
LuaScript script = LoadGlobals(); LuaScript script = LoadGlobals();
try try
{ {
script.DoFile(filename); script.DoFile(filename);
} }
catch (SyntaxErrorException e) catch (SyntaxErrorException e)
{ {
Program.Log.Error("LUAERROR: {0}.", e.DecoratedMessage); Program.Log.Error("LUAERROR: {0}.", e.DecoratedMessage);
return null; return null;
} }
return script; return script;
} }
public static LuaScript LoadGlobals(LuaScript script = null) public static LuaScript LoadGlobals(LuaScript script = null)
@ -367,57 +368,57 @@ namespace FFXIVClassic_Map_Server.lua
script.Options.DebugPrint = s => { Program.Log.Debug(s); }; script.Options.DebugPrint = s => { Program.Log.Debug(s); };
return script; return script;
} }
public static void SendError(Player player, string message) public static void SendError(Player player, string message)
{ {
List<SubPacket> SendError = new List<SubPacket>(); List<SubPacket> SendError = new List<SubPacket>();
SendError.Add(EndEventPacket.BuildPacket(player.actorId, player.currentEventOwner, player.currentEventName)); SendError.Add(EndEventPacket.BuildPacket(player.actorId, player.currentEventOwner, player.currentEventName));
player.SendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM_ERROR, "", message); player.SendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM_ERROR, "", message);
player.playerSession.QueuePacket(BasePacket.CreatePacket(SendError, true, false)); player.playerSession.QueuePacket(BasePacket.CreatePacket(SendError, true, false));
} }
internal static void DoDirectorOnTalked(Director director, Player player, Npc npc) internal static void DoDirectorOnTalked(Director director, Player player, Npc npc)
{ {
string luaPath = String.Format(FILEPATH_DIRECTORS, director.GetName()); string luaPath = String.Format(FILEPATH_DIRECTORS, director.GetName());
if (File.Exists(luaPath)) if (File.Exists(luaPath))
{ {
LuaScript script = LoadScript(luaPath); LuaScript script = LoadScript(luaPath);
if (script == null) if (script == null)
return; return;
//Run Script //Run Script
if (!script.Globals.Get("onTalked").IsNil()) if (!script.Globals.Get("onTalked").IsNil())
script.Call(script.Globals["onTalked"], player, npc); script.Call(script.Globals["onTalked"], player, npc);
} }
else else
{ {
SendError(player, String.Format("ERROR: Could not find script for director {0}.", director.GetName())); SendError(player, String.Format("ERROR: Could not find script for director {0}.", director.GetName()));
} }
} }
internal static void DoDirectorOnCommand(Director director, Player player, Command command) internal static void DoDirectorOnCommand(Director director, Player player, Command command)
{ {
string luaPath = String.Format(FILEPATH_DIRECTORS, director.GetName()); string luaPath = String.Format(FILEPATH_DIRECTORS, director.GetName());
if (File.Exists(luaPath)) if (File.Exists(luaPath))
{ {
LuaScript script = LoadScript(luaPath); LuaScript script = LoadScript(luaPath);
if (script == null) if (script == null)
return; return;
//Run Script //Run Script
if (!script.Globals.Get("onCommand").IsNil()) if (!script.Globals.Get("onCommand").IsNil())
script.Call(script.Globals["onCommand"], player, command); script.Call(script.Globals["onCommand"], player, command);
} }
else else
{ {
SendError(player, String.Format("ERROR: Could not find script for director {0}.", director.GetName())); SendError(player, String.Format("ERROR: Could not find script for director {0}.", director.GetName()));
} }
} }
} }
} }

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

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class ActorDoEmotePacket class ActorDoEmotePacket
{ {

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

@ -4,7 +4,9 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class ActorInstantiatePacket class ActorInstantiatePacket
{ {

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

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorQuestGraphicPacket class SetActorQuestGraphicPacket
{ {

6
FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs
View file

@ -1,4 +1,8 @@
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class AddActorPacket class AddActorPacket
{ {

7
FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs
View file

@ -1,6 +1,9 @@
using System.IO; using FFXIVClassic.Common;
using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class BattleAction1Packet class BattleAction1Packet
{ {

6
FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs
View file

@ -1,4 +1,8 @@
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class DeleteAllActorsPacket class DeleteAllActorsPacket
{ {

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

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class MoveActorToPositionPacket class MoveActorToPositionPacket
{ {

4
FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs
View file

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class RemoveActorPacket class RemoveActorPacket
{ {

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

@ -1,6 +1,8 @@
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorAppearancePacket class SetActorAppearancePacket
{ {

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

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorIconPacket class SetActorIconPacket
{ {

4
FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs
View file

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorIdleAnimationPacket class SetActorIdleAnimationPacket
{ {

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

@ -1,4 +1,6 @@
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorIsZoningPacket class SetActorIsZoningPacket
{ {

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

@ -2,7 +2,9 @@
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorNamePacket class SetActorNamePacket
{ {

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

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorPositionPacket class SetActorPositionPacket
{ {

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

@ -5,7 +5,9 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorPropetyPacket class SetActorPropetyPacket
{ {

5
FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs
View file

@ -1,7 +1,8 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorSpeedPacket class SetActorSpeedPacket
{ {

7
FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs
View file

@ -1,6 +1,9 @@
using System; using FFXIVClassic.Common;
using System;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorStatePacket class SetActorStatePacket
{ {

7
FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs
View file

@ -1,7 +1,10 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorStatusAllPacket class SetActorStatusAllPacket
{ {

7
FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs
View file

@ -1,7 +1,10 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorStatusPacket class SetActorStatusPacket
{ {

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

@ -1,6 +1,8 @@
using System; using System;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorTargetAnimatedPacket class SetActorTargetAnimatedPacket
{ {

3
FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs
View file

@ -1,4 +1,5 @@
using System; using FFXIVClassic.Common;
using System;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor
{ {

6
FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs
View file

@ -1,8 +1,10 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class _0x132Packet class _0x132Packet
{ {

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

@ -1,6 +1,8 @@
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class _0xFPacket class _0xFPacket
{ {

4
FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs
View file

@ -1,4 +1,6 @@
namespace FFXIVClassic_Map_Server.packets.send.actor.battle using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle
{ {
class BattleAction class BattleAction
{ {

7
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs
View file

@ -1,7 +1,10 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle
{ {
class BattleActionX00Packet class BattleActionX00Packet
{ {

7
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs
View file

@ -1,7 +1,10 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle
{ {
class BattleActionX01Packet class BattleActionX01Packet
{ {

7
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs
View file

@ -1,7 +1,10 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle
{ {
class BattleActionX10Packet class BattleActionX10Packet
{ {

7
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs
View file

@ -1,7 +1,10 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle
{ {
class BattleActionX18Packet class BattleActionX18Packet
{ {

7
FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs
View file

@ -1,9 +1,12 @@
using FFXIVClassic_Map_Server.actors; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.actors;
using System; using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor.events using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.events
{ {
class SetEmoteEventCondition class SetEmoteEventCondition
{ {

4
FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs
View file

@ -2,7 +2,9 @@
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor.events using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.events
{ {
class SetEventStatus class SetEventStatus
{ {

4
FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs
View file

@ -3,7 +3,9 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor.events using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.events
{ {
class SetNoticeEventCondition class SetNoticeEventCondition
{ {

4
FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs
View file

@ -3,7 +3,9 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor.events using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.events
{ {
class SetPushEventConditionWithCircle class SetPushEventConditionWithCircle
{ {

4
FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs
View file

@ -3,7 +3,9 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor.events using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.events
{ {
class SetPushEventConditionWithFan class SetPushEventConditionWithFan
{ {

4
FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs
View file

@ -3,7 +3,9 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor.events using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.events
{ {
class SetPushEventConditionWithTriggerBox class SetPushEventConditionWithTriggerBox
{ {

4
FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs
View file

@ -3,7 +3,9 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor.events using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.events
{ {
class SetTalkEventCondition class SetTalkEventCondition
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs
View file

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class EquipmentListX01Packet class EquipmentListX01Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs
View file

@ -3,7 +3,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class EquipmentListX08Packet class EquipmentListX08Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs
View file

@ -3,7 +3,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class EquipmentListX16Packet class EquipmentListX16Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs
View file

@ -3,7 +3,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class EquipmentListX32Packet class EquipmentListX32Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs
View file

@ -3,7 +3,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class EquipmentListX64Packet class EquipmentListX64Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs
View file

@ -1,4 +1,6 @@
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryBeginChangePacket class InventoryBeginChangePacket
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs
View file

@ -1,4 +1,6 @@
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryEndChangePacket class InventoryEndChangePacket
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs
View file

@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryItemEndPacket class InventoryItemEndPacket
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs
View file

@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryItemPacket class InventoryItemPacket
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs
View file

@ -1,7 +1,9 @@
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryListX01Packet class InventoryListX01Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs
View file

@ -3,7 +3,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryListX08Packet class InventoryListX08Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs
View file

@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryListX16Packet class InventoryListX16Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs
View file

@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryListX32Packet class InventoryListX32Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs
View file

@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryListX64Packet class InventoryListX64Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs
View file

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryRemoveX01Packet class InventoryRemoveX01Packet
{ {

7
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs
View file

@ -1,8 +1,11 @@
using System; using FFXIVClassic.Common;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryRemoveX08Packet class InventoryRemoveX08Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs
View file

@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryRemoveX16Packet class InventoryRemoveX16Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs
View file

@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryRemoveX32Packet class InventoryRemoveX32Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs
View file

@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryRemoveX64Packet class InventoryRemoveX64Packet
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs
View file

@ -1,7 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventorySetBeginPacket class InventorySetBeginPacket
{ {

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs
View file

@ -1,4 +1,6 @@
namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventorySetEndPacket class InventorySetEndPacket
{ {

2
FFXIVClassic Map Server/packets/send/GameMessagePacket.cs
View file

@ -4,6 +4,8 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send namespace FFXIVClassic_Map_Server.packets.send
{ {
class GameMessagePacket class GameMessagePacket

4
FFXIVClassic Map Server/packets/send/LogoutPacket.cs
View file

@ -1,4 +1,6 @@
namespace FFXIVClassic_Map_Server.packets.send using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send
{ {
class LogoutPacket class LogoutPacket
{ {

3
FFXIVClassic Map Server/packets/send/PongPacket.cs
View file

@ -1,4 +1,5 @@
using System; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.receive namespace FFXIVClassic_Map_Server.packets.receive

Some files were not shown because too many files have changed in this diff Show more