From 3405acd15b4bb14bb3809cf40eef974b78034e62 Mon Sep 17 00:00:00 2001
From: MarioE <MarioE27@hotmail.com>
Date: Sun, 3 Nov 2013 17:10:20 -0500
Subject: [PATCH] Fix warps

---
 TShockAPI/Commands.cs         |  4 ++--
 TShockAPI/DB/RegionManager.cs | 12 ++++++++----
 TShockAPI/DB/WarpsManager.cs  |  8 +++-----
 TShockAPI/TShock.cs           |  5 ++---
 TShockAPI/Utils.cs            |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 9654b365..e8007ff4 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -2103,7 +2103,7 @@ namespace TShockAPI
                     bool state = false;
                     if (Boolean.TryParse(args.Parameters[2], out state))
                     {
-                        if (TShock.Warps.HideWarp(args.Parameters[1], state))
+                        if (TShock.Warps.Hide(args.Parameters[1], state))
                         {
                             if (state)
                                 args.Player.SendSuccessMessage("Warp " + warpName + " is now private.");
@@ -3447,7 +3447,7 @@ namespace TShockAPI
 									if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.manageregion))
 										tsplr.SendRaptorRegion(TShock.Regions.GetRegionByName(args.Parameters[1]));
 								}
-								TShock.Regions.ReloadAllRegions();
+								TShock.Regions.Reload();
 							}
 							else
 								args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /region resize <region> <u/d/l/r> <amount>");
diff --git a/TShockAPI/DB/RegionManager.cs b/TShockAPI/DB/RegionManager.cs
index be366c02..e3fa0025 100644
--- a/TShockAPI/DB/RegionManager.cs
+++ b/TShockAPI/DB/RegionManager.cs
@@ -27,11 +27,14 @@ namespace TShockAPI.DB
 {
 	public class RegionManager
 	{
+		/// <summary>
+		/// The list of regions.
+		/// </summary>
 		public List<Region> Regions = new List<Region>();
 
 		private IDbConnection database;
 
-		public RegionManager(IDbConnection db)
+		internal RegionManager(IDbConnection db)
 		{
 			database = db;
 			var table = new SqlTable("Regions",
@@ -52,11 +55,12 @@ namespace TShockAPI.DB
 			                                  	? (IQueryBuilder) new SqliteQueryCreator()
 			                                  	: new MysqlQueryCreator());
 			creator.EnsureExists(table);
-
-			ReloadAllRegions();
 		}
 
-		public void ReloadAllRegions()
+		/// <summary>
+		/// Reloads all regions.
+		/// </summary>
+		public void Reload()
 		{
 			try
 			{
diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs
index 7974e3af..9d735ae7 100644
--- a/TShockAPI/DB/WarpsManager.cs
+++ b/TShockAPI/DB/WarpsManager.cs
@@ -35,7 +35,7 @@ namespace TShockAPI.DB
 		public List<Warp> Warps = new List<Warp>();
 
 		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
-		public WarpManager(IDbConnection db)
+		internal WarpManager(IDbConnection db)
 		{
 			database = db;
 
@@ -51,8 +51,6 @@ namespace TShockAPI.DB
 			                                  	? (IQueryBuilder) new SqliteQueryCreator()
 			                                  	: new MysqlQueryCreator());
 			creator.EnsureExists(table);
-
-			ReloadWarps();
 		}
 
 		/// <summary>
@@ -95,7 +93,7 @@ namespace TShockAPI.DB
 					Warps.Add(new Warp(
 						new Point(reader.Get<int>("X"), reader.Get<int>("Y")),
 						reader.Get<string>("WarpName"),
-						reader.Get<string>("Private") != "0"));
+						(reader.Get<string>("Private") ?? "0") != "0"));
 				}
 			}
 		}
@@ -164,7 +162,7 @@ namespace TShockAPI.DB
 		/// <param name="warpName">The warp name.</param>
 		/// <param name="state">The state.</param>
 		/// <returns>Whether the operation suceeded.</returns>
-		public bool HideWarp(string warpName, bool state)
+		public bool Hide(string warpName, bool state)
 		{
 			try
 			{
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index d8047e6a..686b4072 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -612,12 +612,11 @@ namespace TShockAPI
 				AuthToken = 0;
 			}
 
-            Regions.ReloadAllRegions();
+            Regions.Reload();
+			Warps.ReloadWarps();
 
 			Lighting.lightMode = 2;
 			FixChestStacks();
-
-            
 		}
 
 		private void FixChestStacks()
diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index e19ecbf4..2e3c51fc 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -591,7 +591,7 @@ namespace TShockAPI
 			FileTools.SetupConfig();
 			TShock.HandleCommandLinePostConfigLoad(Environment.GetCommandLineArgs());
 			TShock.Groups.LoadPermisions();
-			TShock.Regions.ReloadAllRegions();
+			TShock.Regions.Reload();
 			TShock.Itembans.UpdateItemBans();
 			Hooks.GeneralHooks.OnReloadEvent(player);
 		}