Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-22 10:15:54 +01:00
Code Issues Projects Releases Wiki Activity

Prevent infinite recursion in command aliases.

Browse Source
This commit is contained in:
Wertik 2020-09-19 23:51:23 +02:00 committed by Brianna
parent 4317d6db46
commit a4a3a18c30
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/songoda/skyblock/command/CommandManager.java
View File

@ -21,7 +21,12 @@ import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.*;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.command.TabCompleter;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
@ -145,16 +150,24 @@ public class CommandManager implements CommandExecutor, TabCompleter {
sendConsoleHelpCommands(sender);
} else {
String commandToExecute;
String defaultCommand;
if (plugin.getIslandManager().getIsland(player) == null) {
commandToExecute = mainConfig.getString("Command.Island.Aliases.NoIsland", "island create");
defaultCommand = "island create";
commandToExecute = mainConfig.getString("Command.Island.Aliases.NoIsland", defaultCommand);
} else {
commandToExecute = mainConfig.getString("Command.Island.Aliases.IslandOwned", "island controlpanel");
defaultCommand = "island controlpanel";
commandToExecute = mainConfig.getString("Command.Island.Aliases.IslandOwned", defaultCommand);
}
if(commandToExecute.startsWith("/")) {
if (commandToExecute.trim().equalsIgnoreCase("island") || commandToExecute.trim().equalsIgnoreCase("is")) {
commandToExecute = defaultCommand;
Bukkit.getLogger().warning("Cannot redirect /island to /island or /is, would result in an endless loop. Using the default.");
}
if (commandToExecute.startsWith("/")) {
commandToExecute = commandToExecute.substring(1);
}
String finalCommandToExecute = commandToExecute;
Bukkit.getServer().getScheduler().runTask(plugin, () ->
Bukkit.getServer().dispatchCommand(sender,
@ -408,7 +421,7 @@ public class CommandManager implements CommandExecutor, TabCompleter {
if (nextEndIndex <= -7) {
plugin.getMessageManager().sendMessage(player, configLoad.getString("Command.Island.Help.Page.Message"));
plugin.getSoundManager().playSound(player, CompatibleSound.ENTITY_VILLAGER_NO.getSound(), 1.0F, 1.0F);
plugin.getSoundManager().playSound(player, CompatibleSound.ENTITY_VILLAGER_NO.getSound(), 1.0F, 1.0F);
return;
}

18
src/main/resources/plugin.yml
View File

@ -4,13 +4,13 @@ version: maven-version-number
api-version: 1.13
description: A unique SkyBlock plugin
author: Songoda
authors: [Fabrimat]
softdepend: [HolographicDisplays, Holograms, CMI, PlaceholderAPI, MVdWPlaceholderAPI, Vault, Reserve, PlayerPoints,
LeaderHeads, EpicSpawners, UltimateStacker, WorldEdit, Residence, CoreProtect, CMIEInjector]
loadbefore: [Multiverse-Core, ProtocolLib]
authors: [ Fabrimat ]
softdepend: [ HolographicDisplays, Holograms, CMI, PlaceholderAPI, MVdWPlaceholderAPI, Vault, Reserve, PlayerPoints,
LeaderHeads, EpicSpawners, UltimateStacker, WorldEdit, Residence, CoreProtect, CMIEInjector ]
loadbefore: [ Multiverse-Core, ProtocolLib ]
commands:
island:
description: Island command
aliases: [is]
skyblock:
description: Skyblock info command.
island:
description: Island command
aliases: [ is ]
skyblock:
description: Skyblock info command.