Merge commit '65a7998b16' into general-devel

Conflicts:
	TShockAPI/Commands.cs
This commit is contained in:
Deathmax 2011-07-04 17:08:40 +08:00
commit 2d53001197
3 changed files with 8 additions and 8 deletions

View file

@ -627,7 +627,7 @@ namespace TShockAPI
public void OnConfigRead(ConfigFile file)
{
NPC.maxSpawns = file.DefaultMaximumSpawns;
NPC.defaultMaxSpawns = file.DefaultMaximumSpawns;
NPC.defaultSpawnRate = file.DefaultSpawnRate;
Main.autoSave = file.AutoSave;