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 | e7a1c530651662074504544f3084be6b0fe9033e (patch) | |
| tree | 4a38307e16281bfa2b507418b27ba39d231d442f | |
| parent | e01622d6e895688f23a61114c0eff8fad7b77f1e (diff) | |
| download | Essentials-e7a1c530651662074504544f3084be6b0fe9033e.tar Essentials-e7a1c530651662074504544f3084be6b0fe9033e.tar.gz Essentials-e7a1c530651662074504544f3084be6b0fe9033e.tar.lz Essentials-e7a1c530651662074504544f3084be6b0fe9033e.tar.xz Essentials-e7a1c530651662074504544f3084be6b0fe9033e.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 |