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

Merge remote-tracking branch 'origin/general-devel' into general-devel

Browse source
This commit is contained in:
Deathmax 2012-01-07 13:22:36 +08:00
commit 64d6d2fff1
11 changed files with 267 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/TShock.cs
View file

@ -31,6 +31,7 @@ using MaxMind;
using Mono.Data.Sqlite;
using MySql.Data.MySqlClient;
using Rests;
using TShockAPI.LuaSystem;
using Terraria;
using TShockAPI.DB;
using TShockAPI.Net;
@ -64,6 +65,7 @@ namespace TShockAPI
public static RestManager RestManager;
public static Utils Utils = new Utils();
public static StatTracker StatTracker = new StatTracker();
public static LuaLoader LuaLoader;
/// <summary>
/// Called after TShock is initialized. Useful for plugins that needs hooks before tshock but also depend on tshock being loaded.
@ -420,8 +422,8 @@ namespace TShockAPI
RestApi.Start();
StatTracker.CheckIn();
FixChestStacks();
LuaLoader = new LuaLoader(Path.Combine(".", "lua"));
}
private void FixChestStacks()