Fixed issue with one page /help

VoidemLIVE · May 5, 2024 · 166a0c8 · 166a0c8
1 parent b7c4d94
commit 166a0c8
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.greenwoodmc</groupId>
     <artifactId>HelpCommand</artifactId>
-    <version>2.8.2</version>
+    <version>2.8.3</version>
     <packaging>jar</packaging>
 
     <name>HelpCommand</name>

diff --git a/src/main/java/net/greenwoodmc/helpcommand/commands/help.java b/src/main/java/net/greenwoodmc/helpcommand/commands/help.java
@@ -103,7 +103,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String s, String[] a
                         }
                     } else {
                         // If no page number specified, send page 1
-                        if ((enabledPages.contains(2)) || (args[0].equals("1"))) {
+                        if (args.length > 0 && (enabledPages.contains(2) || args[0].equals("1"))) {
                             // If page 2 exists
                             ver = (String) config.getStringList("help.1").stream().collect(Collectors.joining("\n"));
                             if (papiInstalled) {
@@ -123,7 +123,11 @@ public boolean onCommand(CommandSender sender, Command cmd, String s, String[] a
                         } else {
                             // If page 2 doesn't exist
                             ver = (String) config.getStringList("help.1").stream().collect(Collectors.joining("\n"));
-                            ver2 = PlaceholderAPI.setPlaceholders(player, ver);
+                            if (papiInstalled) {
+                                ver2 = PlaceholderAPI.setPlaceholders(player, ver);
+                            } else {
+                                ver2 = ver;
+                            }
                             player.sendMessage(TextUtil.color(ver2));
                         }
                     }

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -17,7 +17,7 @@
 # Main Help Command
 ######################################
 
-version: "2.8.2" # DO NOT CHANGE THIS VALUE
+version: "2.8.3" # DO NOT CHANGE THIS VALUE
 updateCheck: true # recommended to keep this value as true
 
 help:

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: HelpCommand
-version: '2.8.2-PublicRelease'
+version: '2.8.3-PublicRelease'
 main: net.greenwoodmc.helpcommand.HelpCommand
 api-version: 1.18
 authors: [ VoidemLIVE ]

diff --git a/target/HelpCommand-2.8.2.jar → target/HelpCommand-2.8.3.jar b/target/HelpCommand-2.8.2.jar → target/HelpCommand-2.8.3.jar
diff --git a/target/classes/config.yml b/target/classes/config.yml
@@ -17,7 +17,7 @@
 # Main Help Command
 ######################################
 
-version: "2.8.2" # DO NOT CHANGE THIS VALUE
+version: "2.8.3" # DO NOT CHANGE THIS VALUE
 updateCheck: true # recommended to keep this value as true
 
 help:

diff --git a/target/classes/net/greenwoodmc/helpcommand/commands/help.class b/target/classes/net/greenwoodmc/helpcommand/commands/help.class
diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml
@@ -1,5 +1,5 @@
 name: HelpCommand
-version: '2.8.2-PublicRelease'
+version: '2.8.3-PublicRelease'
 main: net.greenwoodmc.helpcommand.HelpCommand
 api-version: 1.18
 authors: [ VoidemLIVE ]

diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
@@ -1,3 +1,3 @@
 artifactId=HelpCommand
 groupId=net.greenwoodmc
-version=2.8.2
+version=2.8.3
diff --git a/target/original-HelpCommand-2.8.2.jar → target/original-HelpCommand-2.8.3.jar b/target/original-HelpCommand-2.8.2.jar → target/original-HelpCommand-2.8.3.jar