Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 03:17:36 +01:00
Code Issues Projects Releases Wiki Activity

Add PlayerKickEvent causes

Browse Source
This commit is contained in:
Jake Potrebic 2021-05-15 20:30:34 -07:00
parent c9ba0ebadb
commit 93e2ecfd49
2 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
paper-api/src/main/java/org/bukkit/entity/Player.java
View File

@ -335,6 +335,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param message kick message
*/
void kick(final net.kyori.adventure.text.@Nullable Component message);
/**
* Kicks player with custom kick message and cause.
*
* @param message kick message
* @param cause kick cause
*/
void kick(final net.kyori.adventure.text.@Nullable Component message, org.bukkit.event.player.PlayerKickEvent.@NotNull Cause cause);
// Paper end
/**

88
paper-api/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
View File

@ -12,6 +12,7 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private net.kyori.adventure.text.Component leaveMessage; // Paper
private net.kyori.adventure.text.Component kickReason; // Paper
private final Cause cause; // Paper
private boolean cancel;
@Deprecated // Paper
@ -19,14 +20,26 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
super(playerKicked);
this.kickReason = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(kickReason); // Paper
this.leaveMessage = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(leaveMessage); // Paper
this.cause = Cause.UNKNOWN; // Paper
this.cancel = false;
}
// Paper start
@Deprecated
public PlayerKickEvent(@NotNull final Player playerKicked, @NotNull final net.kyori.adventure.text.Component kickReason, @NotNull final net.kyori.adventure.text.Component leaveMessage) {
super(playerKicked);
this.kickReason = kickReason;
this.leaveMessage = leaveMessage;
this.cancel = false;
this.cause = Cause.UNKNOWN;
}
@org.jetbrains.annotations.ApiStatus.Internal
public PlayerKickEvent(@NotNull final Player playerKicked, @NotNull final net.kyori.adventure.text.Component kickReason, @NotNull final net.kyori.adventure.text.Component leaveMessage, @NotNull final Cause cause) {
super(playerKicked);
this.kickReason = kickReason;
this.leaveMessage = leaveMessage;
this.cancel = false;
this.cause = cause;
}
/**
@ -132,4 +145,79 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
public static HandlerList getHandlerList() {
return handlers;
}
// Paper start
/**
* Gets the cause of this kick
*
* @return
*/
@NotNull
public org.bukkit.event.player.PlayerKickEvent.Cause getCause() {
return cause;
}
public enum Cause {
PLUGIN,
WHITELIST,
BANNED,
IP_BANNED,
KICK_COMMAND,
FLYING_PLAYER,
FLYING_VEHICLE,
TIMEOUT,
IDLING,
INVALID_VEHICLE_MOVEMENT,
INVALID_PLAYER_MOVEMENT,
INVALID_ENTITY_ATTACKED,
INVALID_PAYLOAD,
INVALID_COOKIE,
SPAM,
ILLEGAL_ACTION,
ILLEGAL_CHARACTERS,
OUT_OF_ORDER_CHAT,
UNSIGNED_CHAT,
CHAT_VALIDATION_FAILED,
EXPIRED_PROFILE_PUBLIC_KEY,
INVALID_PUBLIC_KEY_SIGNATURE,
TOO_MANY_PENDING_CHATS,
SELF_INTERACTION,
DUPLICATE_LOGIN,
RESOURCE_PACK_REJECTION,
/**
* Spigot's restart command
*/
RESTART_COMMAND,
/**
* Fallback cause
*/
UNKNOWN,
}
// Paper end
}