summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'EssentialsGroupManager/src/org')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java192
1 files changed, 86 insertions, 106 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index d8b7a15e1..e13426716 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -16,6 +16,7 @@ import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,6 +31,7 @@ import org.anjocaido.groupmanager.utils.PermissionCheckResult;
import org.anjocaido.groupmanager.utils.Tasks;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
@@ -325,7 +327,7 @@ public class GroupManager extends JavaPlugin {
PermissionCheckResult permissionResult = null;
ArrayList<User> removeList = null;
String auxString = null;
- List<Player> match = null;
+ List<String> match = null;
User auxUser = null;
Group auxGroup = null;
Group auxGroup2 = null;
@@ -373,15 +375,12 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> <group>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -427,15 +426,12 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -467,15 +463,12 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> <group>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -509,15 +502,12 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/manudelsub <user> <group>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -596,15 +586,12 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> <permission>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -664,15 +651,12 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> <permission>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -718,17 +702,13 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> (+))");
return false;
}
-
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- } else
- targetPlayer = this.getServer().getPlayer(match.get(0).getName());
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -765,6 +745,7 @@ public class GroupManager extends JavaPlugin {
// bukkit perms
if ((args.length == 2) && (args[1].equalsIgnoreCase("+"))) {
+ targetPlayer = this.getServer().getPlayer(auxUser.getName());
if (targetPlayer != null) {
sender.sendMessage(ChatColor.YELLOW + "Superperms reports: ");
for (String line : BukkitPermissions.listPerms(targetPlayer))
@@ -786,19 +767,16 @@ public class GroupManager extends JavaPlugin {
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- } else
- targetPlayer = this.getServer().getPlayer(match.get(0).getName());
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
+ targetPlayer = this.getServer().getPlayer(auxUser.getName());
// VALIDANDO PERMISSAO
permissionResult = permissionHandler.checkFullUserPermission(auxUser, args[1]);
if (permissionResult.resultType.equals(PermissionCheckResult.Type.NOTFOUND)) {
@@ -1089,15 +1067,12 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <user> <variable> <value>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1124,15 +1099,12 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <user> <variable>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
+
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1155,15 +1127,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <user>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1192,15 +1160,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <user> <variable>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1359,15 +1323,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1393,15 +1353,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1431,15 +1387,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1613,15 +1565,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> <group>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1673,15 +1621,11 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> <group>)");
return false;
}
- if (validateOnlinePlayer) {
- match = this.getServer().matchPlayer(args[0]);
- if (match.size() != 1) {
- sender.sendMessage(ChatColor.RED + "Player not found!");
+ if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false;
- }
}
if (match != null) {
- auxUser = dataHolder.getUser(match.get(0).getName());
+ auxUser = dataHolder.getUser(match.get(0));
} else {
auxUser = dataHolder.getUser(args[0]);
}
@@ -1841,6 +1785,42 @@ public class GroupManager extends JavaPlugin {
}
}
+
+ /**
+ * Load a List of players matching the name given. If none online, check
+ * Offline.
+ *
+ * @param playerName, sender
+ * @return true if a single match is found
+ */
+ private List<String> validatePlayer(String playerName, CommandSender sender) {
+
+ List<Player> players = new ArrayList<Player>();
+ List<String> match = new ArrayList<String>();
+
+ players = this.getServer().matchPlayer(playerName);
+ if (players.isEmpty()) {
+ // Check for an offline player.
+ if (Arrays.asList(this.getServer().getOfflinePlayers()).contains(Bukkit.getOfflinePlayer(playerName)))
+ match.add(playerName);
+
+ } else {
+ for (Player player : players) {
+ match.add(player.getName());
+ }
+ }
+
+ if (match.isEmpty() || match == null) {
+ sender.sendMessage(ChatColor.RED + "Player not found!");
+ return null;
+ } else if (match.size() > 1) {
+ sender.sendMessage(ChatColor.RED + "Too many matches found! (" + match.toString() + ")");
+ return null;
+ }
+
+ return match;
+
+ }
/**
* @return the config
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 21:21:44 +0000