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

WorldIDs

Browse source
This commit is contained in:
Lucas Nicodemus 2011-07-22 23:35:21 -06:00
parent 39754f6913
commit 219f5a8cfb
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Commands.cs
View file

@ -1098,7 +1098,7 @@ namespace TShockAPI
{ {
args.Player.SendMessage("Name reserved, use a different name", Color.Red); args.Player.SendMessage("Name reserved, use a different name", Color.Red);
} }
else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldName)) else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldID.ToString()))
{ {
args.Player.SendMessage("Set warp " + warpName, Color.Yellow); args.Player.SendMessage("Set warp " + warpName, Color.Yellow);
} }
@ -1153,7 +1153,7 @@ namespace TShockAPI
page--; //Substract 1 as pages are parsed starting at 1 and not 0 page--; //Substract 1 as pages are parsed starting at 1 and not 0
} }
var warps = TShock.Warps.ListAllWarps(Main.worldName); var warps = TShock.Warps.ListAllWarps(Main.worldID.ToString());
//Check if they are trying to access a page that doesn't exist. //Check if they are trying to access a page that doesn't exist.
int pagecount = warps.Count / pagelimit; int pagecount = warps.Count / pagelimit;
@ -1580,7 +1580,7 @@ namespace TShockAPI
page--; //Substract 1 as pages are parsed starting at 1 and not 0 page--; //Substract 1 as pages are parsed starting at 1 and not 0
} }
var regions = TShock.Regions.ListAllRegions(Main.worldName); var regions = TShock.Regions.ListAllRegions(Main.worldID.ToString());
//Check if they are trying to access a page that doesn't exist. //Check if they are trying to access a page that doesn't exist.
int pagecount = regions.Count / pagelimit; int pagecount = regions.Count / pagelimit;

10
TShockAPI/DB/RegionManager.cs
View file

@ -252,7 +252,7 @@ namespace TShockAPI.DB
string[] SplitIDs = MergedIDs.Split(','); string[] SplitIDs = MergedIDs.Split(',');
Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected, Main.worldName); Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected, Main.worldID.ToString());
r.RegionAllowedIDs = new int[SplitIDs.Length]; r.RegionAllowedIDs = new int[SplitIDs.Length];
try try
{ {
@ -324,7 +324,7 @@ namespace TShockAPI.DB
{ {
com.CommandText = "DELETE FROM Regions WHERE RegionName=@name AND WorldID=@worldid"; com.CommandText = "DELETE FROM Regions WHERE RegionName=@name AND WorldID=@worldid";
com.AddParameter("@name", name.ToLower()); com.AddParameter("@name", name.ToLower());
com.AddParameter("@worldid", Main.worldName); com.AddParameter("@worldid", Main.worldID.ToString());
com.ExecuteNonQuery(); com.ExecuteNonQuery();
ReloadAllRegions(); ReloadAllRegions();
return true; return true;
@ -346,7 +346,7 @@ namespace TShockAPI.DB
com.CommandText = "UPDATE Regions SET Protected=@bool WHERE RegionName=@name AND WorldID=@worldid"; com.CommandText = "UPDATE Regions SET Protected=@bool WHERE RegionName=@name AND WorldID=@worldid";
com.AddParameter("@name", name); com.AddParameter("@name", name);
com.AddParameter("@bool", state ? 1 : 0); com.AddParameter("@bool", state ? 1 : 0);
com.AddParameter("@worldid", Main.worldName); com.AddParameter("@worldid", Main.worldID.ToString());
int q = com.ExecuteNonQuery(); int q = com.ExecuteNonQuery();
ReloadAllRegions(); ReloadAllRegions();
return (q > 0); return (q > 0);
@ -420,7 +420,7 @@ namespace TShockAPI.DB
{ {
com.CommandText = "SELECT * FROM Regions WHERE RegionName=@name AND WorldID=@worldid"; com.CommandText = "SELECT * FROM Regions WHERE RegionName=@name AND WorldID=@worldid";
com.AddParameter("@name", regionName); com.AddParameter("@name", regionName);
com.AddParameter("@worldid", Main.worldName); com.AddParameter("@worldid", Main.worldID.ToString());
string MergedIDs = string.Empty; string MergedIDs = string.Empty;
using (var reader = com.ExecuteReader()) using (var reader = com.ExecuteReader())
{ {
@ -436,7 +436,7 @@ namespace TShockAPI.DB
com.CommandText = "UPDATE Regions SET UserIds=@ids WHERE RegionName=@name AND WorldID=@worldid"; com.CommandText = "UPDATE Regions SET UserIds=@ids WHERE RegionName=@name AND WorldID=@worldid";
com.AddParameter("@ids", MergedIDs); com.AddParameter("@ids", MergedIDs);
com.AddParameter("@name", regionName); com.AddParameter("@name", regionName);
com.AddParameter("@worldid", Main.worldName); com.AddParameter("@worldid", Main.worldID.ToString());
if (com.ExecuteNonQuery() > 0) if (com.ExecuteNonQuery() > 0)
{ {
ReloadAllRegions(); ReloadAllRegions();

2
TShockAPI/DB/WarpsManager.cs
View file

@ -177,7 +177,7 @@ namespace TShockAPI.DB
{ {
com.CommandText = "DELETE FROM Warps WHERE WarpName=@name AND WorldID=@worldid"; com.CommandText = "DELETE FROM Warps WHERE WarpName=@name AND WorldID=@worldid";
com.AddParameter("@name", name.ToLower()); com.AddParameter("@name", name.ToLower());
com.AddParameter("@worldid", Main.worldName); com.AddParameter("@worldid", Main.worldID.ToString());
com.ExecuteNonQuery(); com.ExecuteNonQuery();
return true; return true;
} }