Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-01-24 01:01:51 +01:00
Code Issues Projects Releases Wiki Activity

refactor: Cleanup player finder

Browse Source 
Add a getMulti method without command sender
This commit is contained in:
Ben Woo 2023-02-09 14:21:41 +08:00
parent aed0e178ea
commit 1f907d93af
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/onarandombox/MultiverseCore/utils/PlayerFinder.java
View File

@ -28,7 +28,7 @@ public class PlayerFinder {
* @param playerIdentifier An identifier of name UUID or selector. * @param playerIdentifier An identifier of name UUID or selector.
* @return The player if found, else null. * @return The player if found, else null.
*/ */
public static Player get(@NotNull String playerIdentifier) { public static @Nullable Player get(@Nullable String playerIdentifier) {
return get(playerIdentifier, Bukkit.getConsoleSender()); return get(playerIdentifier, Bukkit.getConsoleSender());
} }
@ -39,8 +39,7 @@ public class PlayerFinder {
* @param sender Target sender for selector. * @param sender Target sender for selector.
* @return The player if found, else null. * @return The player if found, else null.
*/ */
@Nullable public static @Nullable Player get(@Nullable String playerIdentifier, @NotNull CommandSender sender) {
public static Player get(@Nullable String playerIdentifier, @NotNull CommandSender sender) {
if (playerIdentifier == null) { if (playerIdentifier == null) {
return null; return null;
} }
@ -58,6 +57,16 @@ public class PlayerFinder {
return getBySelector(playerIdentifier, sender); return getBySelector(playerIdentifier, sender);
} }
/**
* Get multiple {@link Player} based on many identifiers of name UUID or selector.
*
* @param playerIdentifiers An identifier of multiple names, UUIDs or selectors, separated by comma.
* @return A list of all the {@link Player} found.
*/
public static @NotNull List<Player> getMulti(@Nullable String playerIdentifiers) {
return getMulti(playerIdentifiers, Bukkit.getConsoleSender());
}
/** /**
* Get multiple {@link Player} based on many identifiers of name UUID or selector. * Get multiple {@link Player} based on many identifiers of name UUID or selector.
* *
@ -65,7 +74,9 @@ public class PlayerFinder {
* @param sender Target sender for selector. * @param sender Target sender for selector.
* @return A list of all the {@link Player} found. * @return A list of all the {@link Player} found.
*/ */
public static @NotNull List<Player> getMulti(@Nullable String playerIdentifiers, @NotNull CommandSender sender) { public static @NotNull List<Player> getMulti(@Nullable String playerIdentifiers,
@NotNull CommandSender sender
) {
List<Player> playerResults = new ArrayList<>(); List<Player> playerResults = new ArrayList<>();
if (playerIdentifiers == null || Strings.isNullOrEmpty(playerIdentifiers)) { if (playerIdentifiers == null || Strings.isNullOrEmpty(playerIdentifiers)) {
@ -109,8 +120,7 @@ public class PlayerFinder {
* @param playerUuid UUID of a player. * @param playerUuid UUID of a player.
* @return The player if found, else null. * @return The player if found, else null.
*/ */
@Nullable public static @Nullable Player getByUuid(@NotNull String playerUuid) {
public static Player getByUuid(@NotNull String playerUuid) {
if (!UUID_REGEX.matcher(playerUuid).matches()) { if (!UUID_REGEX.matcher(playerUuid).matches()) {
return null; return null;
} }
@ -129,8 +139,7 @@ public class PlayerFinder {
* @param playerUuid UUID of a player. * @param playerUuid UUID of a player.
* @return The player if found, else null. * @return The player if found, else null.
*/ */
@Nullable public static @Nullable Player getByUuid(@NotNull UUID playerUuid) {
public static Player getByUuid(@NotNull UUID playerUuid) {
return Bukkit.getPlayer(playerUuid); return Bukkit.getPlayer(playerUuid);
} }
@ -142,10 +151,9 @@ public class PlayerFinder {
* @param sender Target sender for selector. * @param sender Target sender for selector.
* @return The player if only one found, else null. * @return The player if only one found, else null.
*/ */
@Nullable public static @Nullable Player getBySelector(@NotNull String playerSelector,
public static Player getBySelector(@NotNull String playerSelector, @NotNull CommandSender sender
@NotNull CommandSender sender) { ) {
List<Player> matchedPlayers = getMultiBySelector(playerSelector, sender); List<Player> matchedPlayers = getMultiBySelector(playerSelector, sender);
if (matchedPlayers == null || matchedPlayers.isEmpty()) { if (matchedPlayers == null || matchedPlayers.isEmpty()) {
Logging.fine("No player found with selector '%s' for %s.", playerSelector, sender.getName()); Logging.fine("No player found with selector '%s' for %s.", playerSelector, sender.getName());
@ -167,10 +175,9 @@ public class PlayerFinder {
* @param sender Target sender for selector. * @param sender Target sender for selector.
* @return A list of all the {@link Player} found. * @return A list of all the {@link Player} found.
*/ */
@Nullable public static @Nullable List<Player> getMultiBySelector(@NotNull String playerSelector,
public static List<Player> getMultiBySelector(@NotNull String playerSelector, @NotNull CommandSender sender
@NotNull CommandSender sender) { ) {
if (playerSelector.charAt(0) != '@') { if (playerSelector.charAt(0) != '@') {
return null; return null;
} }