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

14
FFXIVClassic Lobby Server/NLog.config
View File

@@ -16,22 +16,22 @@
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets async="true">
<tarGets async="true">
<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
add your tarGets here
See https://github.com/nlog/NLog/wiki/TarGets for possible tarGets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<!--
Write events to a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
<tarGet xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
<target xsi:type="ColoredConsole" name="console" layout="[${longdate}] [${uppercase:${level}}] ${message}" />
<target xsi:type="File" name="file" fileName="${basedir}/logs/${shortdate}/lobby.log" layout="[${longdate}] [${uppercase:${level}}] ${message}" />
</targets>
<tarGet xsi:type="ColoredConsole" name="console" layout="[${longdate}] [${uppercase:${level}}] ${message}" />
<tarGet xsi:type="File" name="file" fileName="${basedir}/logs/${shortdate}/lobby.log" layout="[${longdate}] [${uppercase:${level}}] ${message}" />
</tarGets>
<rules>
<!-- add your logging rules here -->

370
FFXIVClassic Lobby Server/NLog.xsd
View File

File diff suppressed because it is too large Load Diff

2
FFXIVClassic Lobby Server/PacketProcessor.cs
View File

@@ -166,7 +166,7 @@ namespace FFXIVClassic_Lobby_Server
if (worldId == 0)
worldId = client.newCharaWorldId;
//Check if this character exists, get world from there
//Check if this character exists, Get world from there
if (worldId == 0 && charaReq.characterId != 0)
{
Character chara = Database.GetCharacter(client.currentUserId, charaReq.characterId);

2
FFXIVClassic Lobby Server/Server.cs
View File

@@ -213,7 +213,7 @@ namespace FFXIVClassic_Lobby_Server
{
BasePacket newPacket = null;
//Too small to even get length
//Too small to even Get length
if (bytesRead <= offset)
return null;

14
FFXIVClassic Lobby Server/packages.config
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cyotek.CircularBuffer" version="1.0.0.0" targetFramework="net45" />
<package id="Dapper" version="1.42" targetFramework="net45" />
<package id="MySql.Data" version="6.9.7" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="NLog" version="4.3.4" targetFramework="net45" />
<package id="NLog.Config" version="4.3.4" targetFramework="net45" />
<package id="NLog.Schema" version="4.3.4" targetFramework="net45" />
<package id="Cyotek.CircularBuffer" version="1.0.0.0" tarGetFramework="net45" />
<package id="Dapper" version="1.42" tarGetFramework="net45" />
<package id="MySql.Data" version="6.9.7" tarGetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" tarGetFramework="net45" />
<package id="NLog" version="4.3.4" tarGetFramework="net45" />
<package id="NLog.Config" version="4.3.4" tarGetFramework="net45" />
<package id="NLog.Schema" version="4.3.4" tarGetFramework="net45" />
</packages>

10
FFXIVClassic Lobby Server/packets/SubPacket.cs
View File

@@ -10,7 +10,7 @@ namespace FFXIVClassic_Lobby_Server.packets
public ushort subpacketSize;
public ushort type;
public uint sourceId;
public uint targetId;
public uint tarGetId;
public uint unknown1;
}
@@ -68,14 +68,14 @@ namespace FFXIVClassic_Lobby_Server.packets
offset += header.subpacketSize;
}
public SubPacket(ushort opcode, uint sourceId, uint targetId, byte[] data)
public SubPacket(ushort opcode, uint sourceId, uint tarGetId, byte[] data)
{
this.header = new SubPacketHeader();
this.gameMessage = new GameMessageHeader();
gameMessage.opcode = opcode;
header.sourceId = sourceId;
header.targetId = targetId;
header.tarGetId = tarGetId;
gameMessage.timestamp = Utils.UnixTimeStampUTC();
@@ -90,14 +90,14 @@ namespace FFXIVClassic_Lobby_Server.packets
header.subpacketSize = (ushort)(SUBPACKET_SIZE + GAMEMESSAGE_SIZE + data.Length);
}
public SubPacket(SubPacket original, uint newTargetId)
public SubPacket(SubPacket original, uint newTarGetId)
{
this.header = new SubPacketHeader();
this.gameMessage = original.gameMessage;
header.subpacketSize = original.header.subpacketSize;
header.type = original.header.type;
header.sourceId = original.header.sourceId;
header.targetId = newTargetId;
header.tarGetId = newTarGetId;
data = original.data;
}