diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-09-10 01:42:11 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-09-10 01:42:11 +0100 |
| commit | 2c7d224b1f6eb889f7e30594753ff15e0f61f0d8 (patch) | |
| tree | ad8ce261a0b5954b81ca52b2e8a0303f4b7c3035 | |
| parent | 7ffa37fe1e06f59494d6de1872eca2d98d8dec2d (diff) | |
| download | Essentials-2c7d224b1f6eb889f7e30594753ff15e0f61f0d8.tar Essentials-2c7d224b1f6eb889f7e30594753ff15e0f61f0d8.tar.gz Essentials-2c7d224b1f6eb889f7e30594753ff15e0f61f0d8.tar.lz Essentials-2c7d224b1f6eb889f7e30594753ff15e0f61f0d8.tar.xz Essentials-2c7d224b1f6eb889f7e30594753ff15e0f61f0d8.zip | |
Fix handling max warp pages.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandwarp.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java index 94e63b7e7..4a739149f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java @@ -95,12 +95,19 @@ public class Commandwarp extends EssentialsCommand page = Integer.parseInt(args[0]); } + final int maxPages = (int)Math.ceil(warpNameList.size() / (double)WARPS_PER_PAGE); + + if (page > maxPages) + { + page = maxPages; + } + final int warpPage = (page - 1) * WARPS_PER_PAGE; final String warpList = StringUtil.joinList(warpNameList.subList(warpPage, warpPage + Math.min(warpNameList.size() - warpPage, WARPS_PER_PAGE))); if (warpNameList.size() > WARPS_PER_PAGE) { - sender.sendMessage(_("warpsCount", warpNameList.size(), page, (int)Math.ceil(warpNameList.size() / (double)WARPS_PER_PAGE))); + sender.sendMessage(_("warpsCount", warpNameList.size(), page, maxPages)); sender.sendMessage(_("warpList", warpList)); } else |