summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-02-13 22:52:14 +0000
committerKHobbits <rob@khobbits.co.uk>2014-02-13 22:52:14 +0000
commita28b7c99334057bfa15cf3443b57872e0a4126cd (patch)
tree5af9cdbc26d33c6d1a4e3c81e4dff7413d85098f
parent72c5ce82fef3b02e3ea53062d32d7b1b662b7ee9 (diff)
downloadEssentials-a28b7c99334057bfa15cf3443b57872e0a4126cd.tar
Essentials-a28b7c99334057bfa15cf3443b57872e0a4126cd.tar.gz
Essentials-a28b7c99334057bfa15cf3443b57872e0a4126cd.tar.lz
Essentials-a28b7c99334057bfa15cf3443b57872e0a4126cd.tar.xz
Essentials-a28b7c99334057bfa15cf3443b57872e0a4126cd.zip
Allow sending customtext chapters as a parameter instead of reading commandLabel
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java b/Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java
index 6c2601823..7e3acd643 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java
@@ -5,6 +5,7 @@ import com.earth2me.essentials.textreader.IText;
import com.earth2me.essentials.textreader.KeywordReplacer;
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
+import com.earth2me.essentials.utils.NumberUtil;
import org.bukkit.Server;
@@ -21,6 +22,19 @@ public class Commandcustomtext extends EssentialsCommand
final IText input = new TextInput(sender, "custom", true, ess);
final IText output = new KeywordReplacer(input, sender, ess);
final TextPager pager = new TextPager(output);
- pager.showPage(commandLabel, args.length > 0 ? args[0] : null, null, sender);
+ String chapter = commandLabel;
+ String page;
+
+ if (commandLabel.equalsIgnoreCase("customtext") && args.length > 0 && !NumberUtil.isInt(commandLabel))
+ {
+ chapter = args[0];
+ page = args.length > 1 ? args[1] : null;
+ }
+ else
+ {
+ page = args.length > 0 ? args[0] : null;
+ }
+
+ pager.showPage(chapter, page, null, sender);
}
}