themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'master' into general-devel

Browse source 
Conflicts:
	TShockAPI/ConfigurationManager.cs
	TShockAPI/TShock.cs
This commit is contained in:
Shank 2011-06-04 21:36:11 -06:00
commit 30a200b6e0
5 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
TShockAPI/TShock.cs
View file

@ -15,7 +15,7 @@ namespace TShockAPI
public static string saveDir = "./tshock/";
public static Version VersionNum = new Version(1, 5, 0, 1);
public static Version VersionNum = new Version(1, 6, 0, 0);
public static bool shownVersion = false;
@ -103,6 +103,14 @@ namespace TShockAPI
public override void Initialize()
{
try
{
FileTools.SetupConfig();
}
catch (Exception ex)
{
Console.WriteLine(ex.ToString());
}
Log.Initialize(FileTools.SaveDir + "log.txt", LogLevel.All, true);
Log.Info("Starting...");
GameHooks.OnPreInitialize += OnPreInit;
@ -364,8 +372,11 @@ namespace TShockAPI
}
}
}
<<<<<<< HEAD
else if (e.MsgID == 0x22) // Client only KillTile
e.Handled = true; // Client only uses it for chests, but sends regular 17 as well.
=======
>>>>>>> master
}
catch (Exception ex)
{
@ -473,14 +484,6 @@ namespace TShockAPI
void OnPreInit()
{
try
{
FileTools.SetupConfig();
}
catch (Exception ex)
{
Console.WriteLine(ex.ToString());
}
}
void OnPostInit()