Skip to content

Set ban source #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zefir-git merged 1 commit into from
Dec 26, 2025
Merged

Set ban source #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/main/java/pro/cloudnode/smp/smpcore/command/BanCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package pro.cloudnode.smp.smpcore.command;

import org.bukkit.NamespacedKey;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import pro.cloudnode.smp.smpcore.Member;
Expand All @@ -25,25 +27,28 @@ public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNul
return sendMessage(sender, SMPCore.messages().errorNoPermission());
if (args.length < 1) return sendMessage(sender, SMPCore.messages().usage(label, "<username> [reason]"));
final @NotNull OfflinePlayer target = SMPCore.getInstance().getServer().getOfflinePlayer(args[0]);

final @Nullable String reason = args.length > 1 ? String.join(" ", Arrays.copyOfRange(args, 1, args.length)) : null;
final @Nullable Date banExpiry = null;
final @NotNull NamespacedKey banSource;
if (sender instanceof final @NotNull Player player)
banSource = new NamespacedKey(SMPCore.getInstance(), "player/" + player.getUniqueId());
else banSource = new NamespacedKey(SMPCore.getInstance(), "console");

final @NotNull Optional<@NotNull Member> targetMember = Member.get(target);
if (targetMember.isEmpty()) {
SMPCore.runMain(() -> target.ban(reason, (Date) null, null));
SMPCore.runMain(() -> target.ban(reason, banExpiry, banSource.asString()));
return sendMessage(sender, SMPCore.messages().bannedPlayer(target));
}
final @NotNull Member main = targetMember.get().altOwner().orElse(targetMember.get());
final @NotNull HashSet<@NotNull Member> alts = main.getAlts();

// todo: possibly add temp bans & ban source
final @Nullable Date banExpiry = null;
final @Nullable String banSource = null;

SMPCore.runMain(() -> main.player().ban(reason, banExpiry, banSource));
SMPCore.runMain(() -> main.player().ban(reason, banExpiry, banSource.asString()));
if (alts.isEmpty()) return sendMessage(sender, SMPCore.messages().bannedMember(main));
else {
SMPCore.runMain(() -> {
for (final @NotNull Member alt : alts)
alt.player().ban(reason, banExpiry, banSource);
alt.player().ban(reason, banExpiry, banSource.asString());
});
return sendMessage(sender, SMPCore.messages().bannedMemberChain(main, alts.stream().toList()));
}
Expand Down
Loading