Skip to content

fix: allow specific kick causes to kick players #389

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
mathiascode merged 1 commit into from
Dec 12, 2025
Merged

fix: allow specific kick causes to kick players #389

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
31 changes: 27 additions & 4 deletions src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import pw.kaboom.extras.util.Utility;

import java.time.Duration;
import java.util.EnumSet;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;

Expand Down Expand Up @@ -56,6 +57,24 @@ public final class PlayerConnection implements Listener {
private static final boolean OP_ON_JOIN = CONFIG.getBoolean("opOnJoin");
private static final boolean RANDOMIZE_SPAWN = CONFIG.getBoolean("randomizeSpawn");

private static final EnumSet<PlayerKickEvent.Cause> ALLOWED_KICK_CAUSES = EnumSet.of(
PlayerKickEvent.Cause.TIMEOUT, PlayerKickEvent.Cause.INVALID_VEHICLE_MOVEMENT,
PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT,
PlayerKickEvent.Cause.INVALID_ENTITY_ATTACKED, PlayerKickEvent.Cause.INVALID_PAYLOAD,
PlayerKickEvent.Cause.INVALID_COOKIE, PlayerKickEvent.Cause.ILLEGAL_ACTION,
PlayerKickEvent.Cause.SELF_INTERACTION, PlayerKickEvent.Cause.RESOURCE_PACK_REJECTION
);

// Kaboom does not use chat signatures, however some clones may wish to enable them.
private static final boolean USE_SIGNED_CHAT = Bukkit.getServer().isEnforcingSecureProfiles();
private static final EnumSet<PlayerKickEvent.Cause> SIGNED_CHAT_KICK_CAUSES = EnumSet.of(
PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT, PlayerKickEvent.Cause.UNSIGNED_CHAT,
PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED,
PlayerKickEvent.Cause.EXPIRED_PROFILE_PUBLIC_KEY,
PlayerKickEvent.Cause.INVALID_PUBLIC_KEY_SIGNATURE,
PlayerKickEvent.Cause.TOO_MANY_PENDING_CHATS
);

@EventHandler
void onAsyncPlayerPreLogin(final AsyncPlayerPreLoginEvent event) {
final Player player = Utility.getPlayerExactIgnoreCase(event.getName());
Expand Down Expand Up @@ -92,11 +111,15 @@ void onPlayerJoin(final PlayerJoinEvent event) {
ServerTabComplete.getLoginNameList().put(player.getUniqueId(), player.getName());
}

@EventHandler
@EventHandler(ignoreCancelled = true)
void onPlayerKick(final PlayerKickEvent event) {
if (!ENABLE_KICK) {
event.setCancelled(true);
}
if (ENABLE_KICK) return;

final PlayerKickEvent.Cause cause = event.getCause();
if (ALLOWED_KICK_CAUSES.contains(cause)) return;
if (USE_SIGNED_CHAT && SIGNED_CHAT_KICK_CAUSES.contains(cause)) return;

event.setCancelled(true);
}

@EventHandler
Expand Down