From 1efce41767e630f31122330bd552ae621f196af3 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Mon, 30 Jan 2017 20:13:10 +0000
Subject: [PATCH] Fix search command page number

---
 .../commands/generic/permission/PermissionInfo.java  | 10 ++--------
 .../luckperms/common/commands/misc/InfoCommand.java  |  3 +--
 .../common/commands/misc/SearchCommand.java          | 11 ++---------
 .../common/commands/utils/ArgumentUtils.java         | 12 ++++++++++++
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java
index ad670bc17..7c9144b4a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java
+++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java
@@ -28,6 +28,7 @@ import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.generic.SharedSubCommand;
 import me.lucko.luckperms.common.commands.sender.Sender;
+import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Constants;
 import me.lucko.luckperms.common.constants.Message;
@@ -56,14 +57,7 @@ public class PermissionInfo extends SharedSubCommand {
             Message.LISTNODES.send(sender, holder.getFriendlyName());
             sender.sendMessage(Util.color(Util.permNodesToStringConsole(holder.getPermissions(false))));
         } else {
-            int page = 1;
-            if (args.size() > 0) {
-                try {
-                    page = Integer.parseInt(args.get(0));
-                } catch (NumberFormatException e) {
-                    // ignored
-                }
-            }
+            int page = ArgumentUtils.handleIntOrElse(0, args, 1);
 
             Map.Entry<FancyMessage, String> ent = Util.permNodesToMessage(holder.getPermissions(false), holder, label, page);
             if (ent.getValue() != null) {
diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java
index 1f554a9e6..3ee446ed5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java
+++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java
@@ -48,8 +48,7 @@ public class InfoCommand extends SingleCommand {
         try {
             int i = Integer.parseInt(value);
             return "&a" + i;
-        } catch (NumberFormatException ignored) {
-        }
+        } catch (NumberFormatException ignored) {}
 
         return "&f" + value;
     }
diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/SearchCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/SearchCommand.java
index 466bf2095..46d84d541 100644
--- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/SearchCommand.java
+++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/SearchCommand.java
@@ -29,6 +29,7 @@ import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.SingleCommand;
 import me.lucko.luckperms.common.commands.sender.Sender;
+import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
@@ -56,15 +57,7 @@ public class SearchCommand extends SingleCommand {
     @Override
     public CommandResult execute(LuckPermsPlugin plugin, Sender sender, List<String> args, String label) throws CommandException {
         String query = args.get(0);
-
-        int page = 1;
-        if (args.size() > 1) {
-            try {
-                page = Integer.parseInt(args.get(1));
-            } catch (NumberFormatException e) {
-                // ignored
-            }
-        }
+        int page = ArgumentUtils.handleIntOrElse(1, args, 1);
 
         Message.SEARCH_SEARCHING.send(sender, query);
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/utils/ArgumentUtils.java b/common/src/main/java/me/lucko/luckperms/common/commands/utils/ArgumentUtils.java
index bcb2eeb6b..54b7b4a40 100644
--- a/common/src/main/java/me/lucko/luckperms/common/commands/utils/ArgumentUtils.java
+++ b/common/src/main/java/me/lucko/luckperms/common/commands/utils/ArgumentUtils.java
@@ -52,6 +52,18 @@ public class ArgumentUtils {
         return args.get(index).replace("{SPACE}", " ");
     }
 
+    public static int handleIntOrElse(int index, List<String> args, int other) {
+        if (index < 0 || index >= args.size()) {
+            return other;
+        }
+
+        try {
+            return Integer.parseInt(args.get(index));
+        } catch (NumberFormatException e) {
+            return other;
+        }
+    }
+
     public static String handleNode(int index, List<String> args) throws ArgumentException {
         String node = args.get(index).replace("{SPACE}", " ");
         if (ArgumentChecker.checkNode(node)) {