Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-29 23:17:26 +02:00
Code Issues Projects Releases Wiki Activity

Fix console command error, disable /is admin reload, fix end frame issue

Browse Source
This commit is contained in:
Esophose 2019-03-23 00:39:55 -06:00
parent 3371e6a859
commit 130a3437a6
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/me/goodandevil/skyblock/command/CommandManager.java
View File

@ -89,7 +89,6 @@ public class CommandManager implements CommandExecutor, TabCompleter {
new me.goodandevil.skyblock.command.commands.admin.GeneratorCommand(),
new me.goodandevil.skyblock.command.commands.admin.LevelCommand(),
new me.goodandevil.skyblock.command.commands.admin.OwnerCommand(),
new me.goodandevil.skyblock.command.commands.admin.ReloadCommand(),
new me.goodandevil.skyblock.command.commands.admin.RemoveHologramCommand(),
new me.goodandevil.skyblock.command.commands.admin.RemoveUpgradeCommand(),
new me.goodandevil.skyblock.command.commands.admin.SetHologramCommand(),
@ -239,14 +238,13 @@ public class CommandManager implements CommandExecutor, TabCompleter {
return;
}
if (!subCommand.hasPermission(player, isAdmin)) {
messageManager.sendMessage(player, configLoad.getString("Command.PermissionDenied." + (isAdmin ? "Admin" : "Island") + ".Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
if (!subCommand.hasPermission(sender, isAdmin)) {
messageManager.sendMessage(sender, configLoad.getString("Command.PermissionDenied." + (isAdmin ? "Admin" : "Island") + ".Message"));
soundManager.playSound(sender, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return;
}
List<String> arguments = new ArrayList<>();
arguments.addAll(Arrays.asList(args));
List<String> arguments = new ArrayList<>(Arrays.asList(args));
arguments.remove(args[0]);
if (adminCommands.contains(subCommand)) {

2
src/main/java/me/goodandevil/skyblock/command/commands/admin/ReloadCommand.java → src/main/java/me/goodandevil/skyblock/command/commands/admin/disabled/ReloadCommand.java
View File

@ -1,4 +1,4 @@
package me.goodandevil.skyblock.command.commands.admin;
package me.goodandevil.skyblock.command.commands.admin.disabled;
import me.goodandevil.skyblock.command.SubCommand;
import me.goodandevil.skyblock.config.FileManager;

5
src/main/java/me/goodandevil/skyblock/listeners/Interact.java
View File

@ -392,11 +392,12 @@ public class Interact implements Listener {
if (skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Island.Block.EndFrame.Enable")
&& islandManager.hasPermission(player, block.getLocation(), "Destroy")) {
ItemStack is = event.getItem();
ItemStack is = event.getPlayer().getItemInHand();
if (is == null || is.getType() == Material.AIR) {
block.setType(Material.AIR);
player.getInventory().setItemInHand(new ItemStack(Materials.END_PORTAL_FRAME.parseMaterial()));
player.getInventory().addItem(new ItemStack(Materials.END_PORTAL_FRAME.parseMaterial(), 1));
player.updateInventory();
soundManager.playSound(player, Sounds.CHICKEN_EGG_POP.bukkitSound(), 10.0F, 10.0F);