mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-05-20 08:26:59 -04:00
PROJECT: added common library to make common files actually common
- renamed sln to FFXIVClassic.sln - threaded logging - todo: print packets using Log.Packet
This commit is contained in:
@@ -5,7 +5,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FFXIVClassic_Lobby_Server.utils;
|
||||
using FFXIVClassic_Lobby_Server.common;
|
||||
using FFXIVClassic.Common;
|
||||
|
||||
namespace FFXIVClassic_Lobby_Server
|
||||
{
|
||||
@@ -33,7 +33,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
}
|
||||
finally
|
||||
@@ -88,9 +88,9 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
pid = 0;
|
||||
cid = 0;
|
||||
@@ -100,7 +100,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
conn.Dispose();
|
||||
}
|
||||
|
||||
Log.Sql(String.Format("CID={0} created on 'characters' table.", cid));
|
||||
Program.Log.Sql(String.Format("CID={0} created on 'characters' table.", cid));
|
||||
}
|
||||
|
||||
return alreadyExists;
|
||||
@@ -183,7 +183,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
conn.Dispose();
|
||||
return;
|
||||
@@ -208,7 +208,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
conn.Dispose();
|
||||
return;
|
||||
@@ -230,7 +230,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
|
||||
}
|
||||
@@ -242,7 +242,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
|
||||
}
|
||||
|
||||
Log.Sql(String.Format("CID={0} state updated to active(2).", cid));
|
||||
Program.Log.Sql(String.Format("CID={0} state updated to active(2).", cid));
|
||||
}
|
||||
|
||||
public static bool renameCharacter(uint userId, uint characterId, uint serverId, String newName)
|
||||
@@ -277,7 +277,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
|
||||
}
|
||||
@@ -286,7 +286,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
conn.Dispose();
|
||||
}
|
||||
|
||||
Log.Sql(String.Format("CID={0} name updated to \"{1}\".", characterId, newName));
|
||||
Program.Log.Sql(String.Format("CID={0} name updated to \"{1}\".", characterId, newName));
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -310,7 +310,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
|
||||
}
|
||||
@@ -320,7 +320,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
}
|
||||
|
||||
Log.Sql(String.Format("CID={0} deleted.", characterId));
|
||||
Program.Log.Sql(String.Format("CID={0} deleted.", characterId));
|
||||
}
|
||||
|
||||
public static List<World> getServers()
|
||||
@@ -335,7 +335,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
worldList = new List<World>(); }
|
||||
finally
|
||||
{
|
||||
@@ -357,7 +357,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
}
|
||||
finally
|
||||
@@ -494,7 +494,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
|
||||
}
|
||||
finally
|
||||
@@ -518,7 +518,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
nameList = new List<String>(); }
|
||||
finally
|
||||
{
|
||||
@@ -540,7 +540,7 @@ namespace FFXIVClassic_Lobby_Server
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
Log.Error(e.ToString());
|
||||
Program.Log.Error(e.ToString());
|
||||
retainerList = new List<Retainer>(); }
|
||||
finally
|
||||
{
|
||||
|
Reference in New Issue
Block a user