KnarCraft/MiniGames
KnarCraft/MiniGames
1
0
Fork 0
mirror of https://github.com/SunNetservers/MiniGames.git synced 2025-04-03 10:16:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adds some missing command argument checks

Browse Source
This commit is contained in:
Kristian Knarvik 2023-03-26 15:52:54 +02:00
parent 0c58860026
commit 49eb0ac82c
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/knarcraft/dropper/command/EditArenaCommand.java
View File

@ -21,6 +21,10 @@ public class EditArenaCommand implements CommandExecutor {
return false; return false;
} }
if (arguments.length < 2) {
return false;
}
DropperArena specifiedArena = Dropper.getInstance().getArenaHandler().getArena(arguments[0]); DropperArena specifiedArena = Dropper.getInstance().getArenaHandler().getArena(arguments[0]);
if (specifiedArena == null) { if (specifiedArena == null) {
commandSender.sendMessage("Unable to find the specified dropper arena."); commandSender.sendMessage("Unable to find the specified dropper arena.");

15
src/main/java/net/knarcraft/dropper/command/LeaveArenaCommand.java
View File

@ -3,15 +3,19 @@ package net.knarcraft.dropper.command;
import net.knarcraft.dropper.Dropper; import net.knarcraft.dropper.Dropper;
import net.knarcraft.dropper.arena.DropperArenaSession; import net.knarcraft.dropper.arena.DropperArenaSession;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
/** /**
* The command used to leave the current dropper arena * The command used to leave the current dropper arena
*/ */
public class LeaveArenaCommand implements CommandExecutor { public class LeaveArenaCommand implements TabExecutor {
@Override @Override
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s,
@ -32,4 +36,11 @@ public class LeaveArenaCommand implements CommandExecutor {
return true; return true;
} }
@Nullable
@Override
public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s,
@NotNull String[] arguments) {
return new ArrayList<>();
}
} }

5
src/main/java/net/knarcraft/dropper/command/RemoveArenaCommand.java
View File

@ -15,6 +15,11 @@ public class RemoveArenaCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s,
@NotNull String[] arguments) { @NotNull String[] arguments) {
// Abort if no name was specified
if (arguments.length < 1) {
return false;
}
// Get the specified arena // Get the specified arena
DropperArena targetArena = Dropper.getInstance().getArenaHandler().getArena(arguments[0]); DropperArena targetArena = Dropper.getInstance().getArenaHandler().getArena(arguments[0]);
if (targetArena == null) { if (targetArena == null) {