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

2011-12-02 13:54:01 +08:00 · 2011-12-02 13:54:01 +08:00 · 7c2d20fd3c
commit 7c2d20fd3c
parent 875c28d6c3 d32d36b459
1 changed files with 2 additions and 2 deletions
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@ -385,8 +385,8 @@ namespace TShockAPI
                AuthToken = 0;
            }
            Regions.ReloadAllRegions();
-            //if (Config.RestApiEnabled)
-                //RestApi.Start();
+            if (Config.RestApiEnabled)
+                RestApi.Start();
        }