themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Warps are now SQL based (sql branch)

Browse source 
Need to make warps auto copy from old structure
This commit is contained in:
Steven French 2011-07-05 21:08:11 +12:00
parent a775511694
commit b090b1fe96
3 changed files with 65 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

21
TShockAPI/Commands.cs
View file

@ -918,10 +918,9 @@ namespace TShockAPI
{
args.Player.SendMessage("Name reserved, use a different name", Color.Red);
}
else if (WarpsManager.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldName))
else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldName))
{
args.Player.SendMessage("Set warp " + warpName, Color.Yellow);
WarpsManager.WriteSettings();
}
else
{
@ -937,7 +936,7 @@ namespace TShockAPI
if (args.Parameters.Count > 0)
{
string warpName = String.Join(" ", args.Parameters);
if (WarpsManager.DeleteWarp(warpName))
if (TShock.Warps.RemoveWarp(warpName))
args.Player.SendMessage("Deleted warp " + warpName, Color.Yellow);
else
args.Player.SendMessage("Could not find specified warp", Color.Red);
@ -957,16 +956,16 @@ namespace TShockAPI
if (args.Parameters.Count > 1)
int.TryParse(args.Parameters[1], out page);
var sb = new StringBuilder();
if (WarpsManager.Warps.Count > (15 * (page - 1)))
if (WarpManager.Warps.Count > (15 * (page - 1)))
{
for (int j = (15 * (page - 1)); j < (15 * page); j++)
{
if (WarpsManager.Warps[j].WorldWarpName == Main.worldName)
if (WarpManager.Warps[j].WorldWarpName == Main.worldName)
{
if (sb.Length != 0)
sb.Append(", ");
sb.Append("/").Append(WarpsManager.Warps[j].WarpName);
if (j == WarpsManager.Warps.Count - 1)
sb.Append("/").Append(WarpManager.Warps[j].WarpName);
if (j == WarpManager.Warps.Count - 1)
{
args.Player.SendMessage(sb.ToString(), Color.Yellow);
break;
@ -979,7 +978,7 @@ namespace TShockAPI
}
}
}
if (WarpsManager.Warps.Count > (15 * page))
if (WarpManager.Warps.Count > (15 * page))
{
args.Player.SendMessage(string.Format("Type /warp list {0} for more warps.", (page + 1)), Color.Yellow);
}
@ -987,10 +986,10 @@ namespace TShockAPI
else
{
string warpName = String.Join(" ", args.Parameters);
var warp = WarpsManager.FindWarp(warpName);
if (warp != Vector2.Zero)
var warp = TShock.Warps.FindWarp(warpName);
if (warp.WarpPos != Vector2.Zero)
{
if (args.Player.Teleport((int)warp.X, (int)warp.Y + 3))
if (args.Player.Teleport((int)warp.WarpPos.X, (int)warp.WarpPos.Y + 3))
args.Player.SendMessage("Warped to " + warpName, Color.Yellow);
}
else