Rx3/Quakecraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve command missing arg checking

Browse Source 
Fix join command check when a player is allready in an arena
This commit is contained in:
Arnaud G. GIBERT 2021-04-24 12:56:45 +02:00
parent 0506ebc2c2
commit 4a9b80276d
10 changed files with 80 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/Geekpower14/Quake/Commands/AddSpawnCommand.java
View File

@ -18,11 +18,13 @@ public class AddSpawnCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if (_plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.valueOf(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.valueOf(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");
return true; return true;

24
src/com/Geekpower14/Quake/Commands/JoinCommand.java
View File

@ -16,13 +16,15 @@ public class JoinCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if ( _plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.valueOf(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.valueOf(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name !");
return true; return true;
} }
if (args.length != 1) { if (args.length != 1) {
@ -30,10 +32,18 @@ public class JoinCommand implements BasicCommand {
return true; return true;
} }
if (arena.isingame(player)) { if (arena.isingame(player)) {
player.sendMessage(ChatColor.RED + "You are already in game !"); player.sendMessage(ChatColor.RED + "You are already in this game !");
return true; return true;
} }
else {
Arena arena_tmp = _plugin._am.getArenabyPlayer(player);
if ( arena_tmp != null ) {
player.sendMessage(ChatColor.RED + "You are already in the " + arena_tmp._name + " arena !");
return true;
}
}
arena.joinArena(player); arena.joinArena(player);
} else { } else {
player.sendMessage(_plugin._trad.get("NoPermission")); player.sendMessage(_plugin._trad.get("NoPermission"));
} }

12
src/com/Geekpower14/Quake/Commands/RemoveCommand.java
View File

@ -16,11 +16,13 @@ public class RemoveCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if (_plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.valueOf(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.valueOf(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");
return true; return true;

12
src/com/Geekpower14/Quake/Commands/RemoveSpawnCommand.java
View File

@ -18,11 +18,13 @@ public class RemoveSpawnCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if (_plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.valueOf(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.valueOf(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");
return true; return true;

12
src/com/Geekpower14/Quake/Commands/SaveCommand.java
View File

@ -23,11 +23,13 @@ public class SaveCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if (_plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.parseInt(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.parseInt(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");
return true; return true;

12
src/com/Geekpower14/Quake/Commands/SetMapCommand.java
View File

@ -23,11 +23,13 @@ public class SetMapCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if (_plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.parseInt(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.parseInt(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");
return true; return true;

12
src/com/Geekpower14/Quake/Commands/SetMaxCommand.java
View File

@ -23,11 +23,13 @@ public class SetMaxCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if (_plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.parseInt(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.parseInt(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");
return true; return true;

12
src/com/Geekpower14/Quake/Commands/SetMinCommand.java
View File

@ -23,11 +23,13 @@ public class SetMinCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if (_plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.valueOf(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.valueOf(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");
return true; return true;

12
src/com/Geekpower14/Quake/Commands/StartCommand.java
View File

@ -23,11 +23,13 @@ public class StartCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if(Quake.hasPermission(player, getPermission())) { if(Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if (_plugin._am.exist(args[0])) { if ( args.length > 0) {
arena = _plugin._am.getArenabyName(args[0]); if ( _plugin._am.exist(args[0])) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyID(Integer.parseInt(args[0])); } else if (args[0].matches("^\\d*$")) {
} arena = _plugin._am.getArenabyID(Integer.parseInt(args[0]));
}
}
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");
return true; return true;

14
src/com/Geekpower14/Quake/Commands/StopCommand.java
View File

@ -23,13 +23,13 @@ public class StopCommand implements BasicCommand {
public boolean onCommand(Player player, String[] args) { public boolean onCommand(Player player, String[] args) {
if (Quake.hasPermission(player, getPermission())) { if (Quake.hasPermission(player, getPermission())) {
Arena arena = null; Arena arena = null;
if(args.length == 0) { if ( args.length > 0) {
if (_plugin._am.exist(args[0])) {
} else if (_plugin._am.exist(args[0])) { arena = _plugin._am.getArenabyName(args[0]);
arena = _plugin._am.getArenabyName(args[0]); } else if (args[0].matches("^\\d*$")) {
} else if (args[0].matches("^\\d*$")) { arena = _plugin._am.getArenabyID(Integer.parseInt(args[0]));
arena = _plugin._am.getArenabyID(Integer.parseInt(args[0])); }
} }
if (arena == null) { if (arena == null) {
player.sendMessage(ChatColor.RED + "Please type a good arena name ! !"); player.sendMessage(ChatColor.RED + "Please type a good arena name ! !");