Skip to content

Commit f5cd2bc

Browse files
committed
Improved player handling from args for two classes
1 parent 4cdc70f commit f5cd2bc

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

src/main/java/de/lars/utilsmanager/commands/admin/FeedCommand.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package de.lars.utilsmanager.commands.admin;
22

33
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
4+
import de.lars.utilsmanager.util.CheckPlayers;
45
import de.lars.utilsmanager.util.RankStatements;
56
import de.lars.utilsmanager.util.Statements;
67
import io.papermc.paper.command.brigadier.BasicCommand;
@@ -30,14 +31,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
3031
}
3132

3233
player = Bukkit.getPlayer(args[0]);
33-
if (!Bukkit.getOnlinePlayers().contains(player) || player == null) {
34-
if (LanguageAPI.getApi().getLanguage(sendplayer) == 2) {
35-
sendplayer.sendMessage(Component.text("Der Spieler existiert nicht!", NamedTextColor.RED));
36-
} else {
37-
sendplayer.sendMessage(Component.text("The Player doesn't exist!", NamedTextColor.RED));
38-
}
39-
return;
40-
}
34+
if (CheckPlayers.checkPlayer(sendplayer, player)) return;
4135
if (LanguageAPI.getApi().getLanguage(player) == 2) {
4236
player.sendMessage(Statements.getPrefix().append(Component.text("Du wurdest gefüttert!", NamedTextColor.GREEN)));
4337
} else {

src/main/java/de/lars/utilsmanager/commands/economy/PayCommand.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import de.lars.apimanager.apis.coinAPI.CoinAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
5+
import de.lars.utilsmanager.util.CheckPlayers;
56
import de.lars.utilsmanager.util.Statements;
67
import io.papermc.paper.command.brigadier.BasicCommand;
78
import io.papermc.paper.command.brigadier.CommandSourceStack;
@@ -51,15 +52,8 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
5152
return;
5253
}
5354
sendercoins = CoinAPI.getApi().getCoins(sendplayer);
54-
OfflinePlayer sendPlayer = Bukkit.getPlayer(args[0]);
55-
if (sendPlayer == null) {
56-
if (LanguageAPI.getApi().getLanguage(sendplayer) == 2) {
57-
player.sendMessage( NamedTextColor.RED + "Der Spieler existiert nicht!");
58-
} else {
59-
player.sendMessage(NamedTextColor.RED + "The Player doesn't exist!");
60-
}
61-
return;
62-
}
55+
OfflinePlayer recipient = Bukkit.getPlayer(args[0]);
56+
if (CheckPlayers.checkOfflinePlayer(sendplayer, recipient)) return;
6357
if (paying > sendercoins) {
6458
if (LanguageAPI.getApi().getLanguage(sendplayer) == 2) {
6559
player.sendMessage(NamedTextColor.RED + "Du hast nicht genug Geld zum überweisen!");

0 commit comments

Comments
 (0)