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

Merge pull request #283 from darkunderdog/patch-5

Browse source 
Fixes /warp list and /region list
This commit is contained in:
high6 2011-08-08 19:33:16 -07:00
commit 2707dffde9
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Commands.cs
View file

@ -1296,7 +1296,7 @@ namespace TShockAPI
//Add up to pagelimit names to a list //Add up to pagelimit names to a list
var nameslist = new List<string>(); var nameslist = new List<string>();
for (int i = 0; i < pagelimit && i + (page * pagelimit) < warps.Count; i++) for (int i = (page * pagelimit); (i < ((page * pagelimit) + pagelimit)) && i < warps.Count; i++)
{ {
nameslist.Add(warps[i].WarpName); nameslist.Add(warps[i].WarpName);
} }
@ -1310,7 +1310,7 @@ namespace TShockAPI
if (page < pagecount) if (page < pagecount)
{ {
args.Player.SendMessage(string.Format("Type /warp list {0} for more warps.", (page + 1)), Color.Yellow); args.Player.SendMessage(string.Format("Type /warp list {0} for more warps.", (page + 2)), Color.Yellow);
} }
} }
else else
@ -1869,7 +1869,7 @@ namespace TShockAPI
//Add up to pagelimit names to a list //Add up to pagelimit names to a list
var nameslist = new List<string>(); var nameslist = new List<string>();
for (int i = 0; i < pagelimit && i + (page * pagelimit) < regions.Count; i++) for (int i = (page * pagelimit); (i < ((page * pagelimit) + pagelimit)) && i < regions.Count; i++)
{ {
nameslist.Add(regions[i].Name); nameslist.Add(regions[i].Name);
} }
@ -1883,7 +1883,7 @@ namespace TShockAPI
if (page < pagecount) if (page < pagecount)
{ {
args.Player.SendMessage(string.Format("Type /region list {0} for more regions.", (page + 1)), Color.Yellow); args.Player.SendMessage(string.Format("Type /region list {0} for more regions.", (page + 2)), Color.Yellow);
} }
break; break;