Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2025-01-07 19:28:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug where using the command help causes an error in standalone mode

Browse Source
This commit is contained in:
GeorgH93 2020-09-07 22:30:36 +02:00
parent f316bdd66e
commit 75d0efc044
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java
View File

@ -19,7 +19,7 @@
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin; import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull;
public interface MinepacksPluginExtended extends MinepacksPlugin public interface MinepacksPluginExtended extends MinepacksPlugin
{ {
@ -28,5 +28,5 @@ public interface MinepacksPluginExtended extends MinepacksPlugin
* *
* @return The command manager instance. null if the plugin is running in standalone mode * @return The command manager instance. null if the plugin is running in standalone mode
*/ */
@Nullable MinepacksCommandManager getCommandManager(); @NotNull MinepacksCommandManager getCommandManager();
} }

4
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java
View File

@ -38,7 +38,7 @@
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
public class CommandManager extends CommandExecutorWithSubCommandsGeneric<MinepacksCommand> /*if_not[STANDALONE]*/ implements MinepacksCommandManager /*end[STANDALONE]*/ public class CommandManager extends CommandExecutorWithSubCommandsGeneric<MinepacksCommand> implements MinepacksCommandManager
{ {
private final Minepacks plugin; private final Minepacks plugin;
private final RegisterablePluginCommand backpackCommand; private final RegisterablePluginCommand backpackCommand;
@ -53,7 +53,7 @@ public CommandManager(@NotNull Minepacks plugin)
backpackCommand.setExecutor(this); backpackCommand.setExecutor(this);
backpackCommand.setTabCompleter(this); backpackCommand.setTabCompleter(this);
helpFormat = plugin.getLanguage().getMessage("Commands.HelpFormat").replaceAll("\\{MainCommand\\}", "%1\\$s").replaceAll("\\{SubCommand\\}", "%2\\$s").replaceAll("\\{Parameters\\}", "%3\\$s").replaceAll("\\{Description\\}", "%4\\$s").replaceAll("suggest_command", "%5\\$s"); helpFormat = plugin.getLanguage().getMessage("Commands.HelpFormat").replaceAll("\\{MainCommand}", "%1\\$s").replaceAll("\\{SubCommand}", "%2\\$s").replaceAll("\\{Parameters}", "%3\\$s").replaceAll("\\{Description}", "%4\\$s").replaceAll("suggest_command", "%5\\$s");
// Setting the help format for the marry commands as well as the no permissions and not from console message // Setting the help format for the marry commands as well as the no permissions and not from console message
try try

6
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
View File

@ -345,13 +345,9 @@ public void getBackpack(final @NotNull OfflinePlayer owner, final @NotNull Callb
} }
@Override @Override
public MinepacksCommandManager getCommandManager() public @NotNull MinepacksCommandManager getCommandManager()
{ {
/*if[STANDALONE]
return null;
else[STANDALONE]*/
return commandManager; return commandManager;
/*end[STANDALONE]*/
} }
public int getBackpackPermSize(final @NotNull Player player) public int getBackpackPermSize(final @NotNull Player player)