Re-do warps

TShockAPI/Commands.cs

@@ -2032,8 +2032,9 @@ namespace TShockAPI
 				int pageNumber;
 				if (!PaginationTools.TryParsePageNumber(args.Parameters, 1, args.Player, out pageNumber))
 					return;
-				IEnumerable<string> warpNames = from warp in TShock.Warps.ListAllPublicWarps(Main.worldID.ToString())
+				IEnumerable<string> warpNames = from warp in TShock.Warps.Warps
-												select warp.WarpName;
+												where !warp.IsPrivate
+												select warp.Name;
 				PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(warpNames),
 					new PaginationTools.Settings
 					{
@@ -2053,13 +2054,13 @@ namespace TShockAPI
                     {
                         args.Player.SendErrorMessage("Name reserved, use a different name.");
                     }
-                    else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldID.ToString()))
+                    else if (TShock.Warps.Add(args.Player.TileX, args.Player.TileY, warpName))
                     {
                         args.Player.SendSuccessMessage("Warp added: " + warpName);
 						foreach (TSPlayer tsplr in TShock.Players)
 						{
 							if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp))
-								tsplr.SendRaptorWarp(TShock.Warps.FindWarp(warpName));
+								tsplr.SendRaptorWarp(TShock.Warps.Find(warpName));
 						}
                     }
                     else
@@ -2077,7 +2078,7 @@ namespace TShockAPI
                 if (args.Parameters.Count == 2)
                 {
                     string warpName = args.Parameters[1];
-					if (TShock.Warps.RemoveWarp(warpName))
+					if (TShock.Warps.Remove(warpName))
 					{
 						args.Player.SendSuccessMessage("Warp deleted: " + warpName);
 						foreach (TSPlayer tsplr in TShock.Players)
@@ -2139,15 +2140,16 @@ namespace TShockAPI
 					TShock.Utils.SendMultipleMatchError(args.Player, foundplr.Select(p => p.Name));
                     return;
                 }
+
                 string warpName = args.Parameters[2];
-                var warp = TShock.Warps.FindWarp(warpName);
+                var warp = TShock.Warps.Find(warpName);
                 var plr = foundplr[0];
-                if (warp.WarpPos != Vector2.Zero)
+				if (warp.Position != Point.Zero)
 				{
-                    if (plr.Teleport((int)warp.WarpPos.X*16, (int)warp.WarpPos.Y*16 ))
+					if (plr.Teleport(warp.Position.X * 16, warp.Position.Y * 16))
 					{
-                        plr.SendSuccessMessage(string.Format("{0} warped you to {1}.", args.Player.Name, warpName));
+						plr.SendSuccessMessage(String.Format("{0} warped you to {1}.", args.Player.Name, warpName));
-                        args.Player.SendSuccessMessage(string.Format("You warped {0} to {1}.", plr.Name, warpName));
+						args.Player.SendSuccessMessage(String.Format("You warped {0} to {1}.", plr.Name, warpName));
 					}
 				}
 				else
@@ -2159,10 +2161,10 @@ namespace TShockAPI
             else
             {
                 string warpName = String.Join(" ", args.Parameters);
-                var warp = TShock.Warps.FindWarp(warpName);
+                var warp = TShock.Warps.Find(warpName);
-                if (warp.WarpPos != Vector2.Zero)
+                if (warp.Position != Point.Zero)
                 {
-                    if (args.Player.Teleport((int)warp.WarpPos.X*16, (int)warp.WarpPos.Y*16 ))
+					if (args.Player.Teleport(warp.Position.X * 16, warp.Position.Y * 16))
                         args.Player.SendSuccessMessage("Warped to " + warpName + ".");
                 }
                 else

TShockAPI/DB/RegionManager.cs

@@ -432,6 +432,9 @@ namespace TShockAPI.DB
 		{
 			try
 			{
+				Region region = Regions.First(r => String.Equals(regionName, r.Name, StringComparison.OrdinalIgnoreCase));
+				region.Area = new Rectangle(x, y, width, height);
+
 				if (database.Query("UPDATE Regions SET X1 = @0, Y1 = @1, width = @2, height = @3 WHERE RegionName = @4 AND WorldID = @5",
 					x, y, width, height, regionName, Main.worldID.ToString()) > 0)
 					return true;
@@ -442,27 +445,6 @@ namespace TShockAPI.DB
 			}
 			return false;
 		}
-		/// <summary>
-		/// Offsets a region.
-		/// </summary>
-		/// <param name="regionName">The region name.</param>
-		/// <param name="x">The X offset.</param>
-		/// <param name="y">The Y offset.</param>
-		/// <returns>Whether the operation succeeded.</returns>
-		public bool OffsetRegion(string regionName, int x, int y)
-		{
-			try
-			{
-				if (database.Query("UPDATE Regions SET X1 = X1 + @0, Y1 = Y1 + @1 WHERE RegionName = @2 AND WorldID = @3",
-					x, y, regionName, Main.worldID.ToString()) > 0)
-					return true;
-			}
-			catch (Exception ex)
-			{
-				Log.Error(ex.ToString());
-			}
-			return false;
-		}
 
 		/// <summary>
 		/// Gets all the regions names from world

TShockAPI/DB/WarpsManager.cs

@@ -20,6 +20,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using MySql.Data.MySqlClient;
 using Terraria;
 
@@ -50,90 +51,86 @@ namespace TShockAPI.DB
 			                                  	? (IQueryBuilder) new SqliteQueryCreator()
 			                                  	: new MysqlQueryCreator());
 			creator.EnsureExists(table);
-		}
 
-		public bool AddWarp(int x, int y, string name, string worldid)
+			ReloadWarps();
-		{
-			try
-			{
-				database.Query("INSERT INTO Warps (X, Y, WarpName, WorldID) VALUES (@0, @1, @2, @3);", x, y, name, worldid);
-				Warps.Add(new Warp(new Vector2(x, y), name, worldid, "0"));
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Log.Error(ex.ToString());
-			}
-			return false;
-		}
-
-		public bool RemoveWarp(string name)
-		{
-			try
-			{
-				database.Query("DELETE FROM Warps WHERE WarpName=@0 AND WorldID=@1", name, Main.worldID.ToString());
-				Warps.RemoveAll(w => w.WarpName == name);
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Log.Error(ex.ToString());
-			}
-			return false;
-		}
-
-		public Warp FindWarp(string name)
-		{
-			try
-			{
-				using (
-					var reader = database.QueryReader("SELECT * FROM Warps WHERE WarpName=@0 AND WorldID=@1", name,
-					                                  Main.worldID.ToString()))
-				{
-					if (reader.Read())
-					{
-						try
-						{
-							return new Warp(new Vector2(reader.Get<int>("X"), reader.Get<int>("Y")), reader.Get<string>("WarpName"),
-							                reader.Get<string>("WorldID"), reader.Get<string>("Private"));
-						}
-						catch
-						{
-							return new Warp(new Vector2(reader.Get<int>("X"), reader.Get<int>("Y")), reader.Get<string>("WarpName"),
-							                reader.Get<string>("WorldID"), "0");
-						}
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				Log.Error(ex.ToString());
-			}
-			return new Warp();
 		}
 
 		/// <summary>
-		/// Gets all the warps names from world
+		/// Adds a warp.
 		/// </summary>
-		/// <param name="worldid">World name to get warps from</param>
+		/// <param name="x">The X position.</param>
-		/// <returns>List of warps with only their names</returns>
+		/// <param name="y">The Y position.</param>
-		public List<Warp> ListAllPublicWarps(string worldid)
+		/// <param name="name">The name.</param>
+		/// <returns>Whether the opration succeeded.</returns>
+		public bool Add(int x, int y, string name)
 		{
-			var warps = new List<Warp>();
 			try
 			{
-				using (var reader = database.QueryReader("SELECT * FROM Warps WHERE Private = @0 AND WorldID = @1",
+				if (database.Query("INSERT INTO Warps (X, Y, WarpName, WorldID) VALUES (@0, @1, @2, @3);",
-					"0", worldid))
+					x, y, name, Main.worldID.ToString()) > 0)
 				{
-					while (reader.Read())
+					Warps.Add(new Warp(new Point(x, y), name));
-						warps.Add(new Warp {WarpName = reader.Get<string>("WarpName")});
+					return true;
 				}
 			}
 			catch (Exception ex)
 			{
 				Log.Error(ex.ToString());
 			}
-			return warps;
+			return false;
+		}
+
+		/// <summary>
+		/// Reloads all warps.
+		/// </summary>
+		public void ReloadWarps()
+		{
+			Warps.Clear();
+
+			using (var reader = database.QueryReader("SELECT * FROM Warps WHERE WorldID = @0",
+				Main.worldID.ToString()))
+			{
+				while (reader.Read())
+				{
+					Warps.Add(new Warp(
+						new Point(reader.Get<int>("X"), reader.Get<int>("Y")),
+						reader.Get<string>("WarpName"),
+						reader.Get<string>("Private") != "0"));
+				}
+			}
+		}
+
+		/// <summary>
+		/// Removes a warp.
+		/// </summary>
+		/// <param name="warpName">The warp name.</param>
+		/// <returns>Whether the operation succeeded.</returns>
+		public bool Remove(string warpName)
+		{
+			try
+			{
+				if (database.Query("DELETE FROM Warps WHERE WarpName = @0 AND WorldID = @1",
+					warpName, Main.worldID.ToString()) > 0)
+				{
+					Warps.RemoveAll(w => String.Equals(w.Name, warpName, StringComparison.OrdinalIgnoreCase));
+					return true;
+				}
+			}
+			catch (Exception ex)
+			{
+				Log.Error(ex.ToString());
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Finds the warp with the given name.
+		/// </summary>
+		/// <param name="warpName">The name.</param>
+		/// <returns>The warp, if it exists, or else null.</returns>
+		public Warp Find(string warpName)
+		{
+			return Warps.FirstOrDefault(w => String.Equals(w.Name, warpName, StringComparison.OrdinalIgnoreCase));
 		}
 
 		/// <summary>
@@ -150,7 +147,7 @@ namespace TShockAPI.DB
 				if (database.Query("UPDATE Warps SET X = @0, Y = @1 WHERE WarpName = @2 AND WorldID = @3",
 					x, y, warpName, Main.worldID.ToString()) > 0)
 				{
-					Warps.Find(w => w.WarpName == warpName).WarpPos = new Vector2(x, y);
+					Warps.Find(w => String.Equals(w.Name, warpName, StringComparison.OrdinalIgnoreCase)).Position = new Point(x, y);
 					return true;
 				}
 			}
@@ -174,7 +171,7 @@ namespace TShockAPI.DB
 				if (database.Query("UPDATE Warps SET Private = @0 WHERE WarpName = @1 AND WorldID = @2",
 					state ? "1" : "0", warpName, Main.worldID.ToString()) > 0)
 				{
-					Warps.Find(w => w.WarpName == warpName).Private = state ? "1" : "0";
+					Warps.Find(w => String.Equals(w.Name, warpName, StringComparison.OrdinalIgnoreCase)).IsPrivate = state;
 					return true;
 				}
 			}
@@ -186,27 +183,36 @@ namespace TShockAPI.DB
 		}
 	}
 
+	/// <summary>
+	/// Represents a warp.
+	/// </summary>
 	public class Warp
 	{
-		public Vector2 WarpPos { get; set; }
+		/// <summary>
-		public string WarpName { get; set; }
+		/// Gets or sets the name.
-		public string WorldWarpID { get; set; }
+		/// </summary>
-		public string Private { get; set; }
+		public string Name { get; set; }
+		/// <summary>
+		/// Gets or sets the warp's privacy state.
+		/// </summary>
+		public bool IsPrivate { get; set; }
+		/// <summary>
+		/// Gets or sets the position.
+		/// </summary>
+		public Point Position { get; set; }
 
-		public Warp(Vector2 warppos, string name, string worldid, string hidden)
+		public Warp(Point position, string name, bool isPrivate = false)
 		{
-			WarpPos = warppos;
+			Name = name;
-			WarpName = name;
+			Position = position;
-			WorldWarpID = worldid;
+			IsPrivate = isPrivate;
-			Private = hidden;
 		}
 
 		public Warp()
 		{
-			WarpPos = Vector2.Zero;
+			Position = Point.Zero;
-			WarpName = null;
+			Name = "";
-			WorldWarpID = string.Empty;
+			IsPrivate = false;
-			Private = "0";
 		}
 	}
 }

TShockAPI/GetDataHandlers.cs

@@ -3454,14 +3454,14 @@ namespace TShockAPI
 						bool isHidden = args.Data.ReadBoolean();
 						string warpName = args.Data.ReadString();
 
-						Warp warp = TShock.Warps.FindWarp(warpName);
+						Warp warp = TShock.Warps.Find(warpName);
-						if (warp.WarpPos == Vector2.Zero)
+						if (warp == null)
 						{
-							TShock.Warps.AddWarp(x, y, warpName, Main.worldID.ToString());
+							TShock.Warps.Add(x, y, warpName);
 							foreach (TSPlayer tsplr in TShock.Players)
 							{
 								if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)
-									tsplr.SendRaptorWarp(TShock.Warps.FindWarp(warpName));
+									tsplr.SendRaptorWarp(TShock.Warps.Find(warpName));
 							}
 							Log.Info("{0} added warp \"{1}\".", args.Player.UserAccountName, warpName);
 						}
@@ -3481,7 +3481,7 @@ namespace TShockAPI
 					if (args.Player.Group.HasPermission(Permissions.managewarp))
 					{
 						string warpName = args.Data.ReadString();
-						TShock.Warps.RemoveWarp(warpName);
+						TShock.Warps.Remove(warpName);
 						foreach (TSPlayer tsplr in TShock.Players)
 						{
 							if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)

TShockAPI/TSPlayer.cs

@@ -1013,10 +1013,10 @@ namespace TShockAPI
 						writer.Write((byte)PacketTypes.Placeholder);
 						writer.Write((byte)RaptorPacketTypes.Warp);
 
-						writer.Write(warp.WarpPos.X);
+						writer.Write(warp.Position.X);
-						writer.Write(warp.WarpPos.Y);
+						writer.Write(warp.Position.Y);
-						writer.Write(warp.Private != "0");
+						writer.Write(warp.IsPrivate);
-						writer.Write(warp.WarpName);
+						writer.Write(warp.Name);
 
 						length = (int)writer.BaseStream.Position;
 						writer.BaseStream.Position = 0;