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

6
TShockAPI/ConfigurationManager.cs
View file

@ -62,10 +62,16 @@ namespace TShockAPI
kickBoom = cfg.KickExplosives;
spawnProtect = cfg.SpawnProtection;
spawnProtectRadius = cfg.SpawnProtectionRadius;
Terraria.NPC.maxSpawns = defaultMaxSpawns;
Terraria.NPC.defaultSpawnRate = defaultSpawnRate;
}
public static void WriteJsonConfiguration()
{
if (!System.IO.Directory.Exists(FileTools.SaveDir))
{
System.IO.Directory.CreateDirectory(FileTools.SaveDir);
}
if (System.IO.File.Exists(FileTools.SaveDir + "config.json"))
{
return;