From 07127fb06738322db78bc32e9986a076f2239bbf Mon Sep 17 00:00:00 2001 From: Misat11 <20199703+Misat11@users.noreply.github.com> Date: Wed, 21 Aug 2024 21:27:20 +0200 Subject: [PATCH] fix(core): ServerListPingEvent is not cancellable in bukkit --- .../impl/bukkit/event/server/BukkitServerListPingEvent.java | 3 +-- .../lib/event/server/ServerListPingEvent.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/bukkit/src/main/java/org/screamingsandals/lib/impl/bukkit/event/server/BukkitServerListPingEvent.java b/core/bukkit/src/main/java/org/screamingsandals/lib/impl/bukkit/event/server/BukkitServerListPingEvent.java index 724bd94b..ea48b330 100644 --- a/core/bukkit/src/main/java/org/screamingsandals/lib/impl/bukkit/event/server/BukkitServerListPingEvent.java +++ b/core/bukkit/src/main/java/org/screamingsandals/lib/impl/bukkit/event/server/BukkitServerListPingEvent.java @@ -25,7 +25,6 @@ import org.screamingsandals.lib.event.server.ServerListPingEvent; import org.screamingsandals.lib.impl.adventure.spectator.AdventureBackend; import org.screamingsandals.lib.impl.bukkit.BukkitCore; -import org.screamingsandals.lib.impl.bukkit.event.BukkitCancellable; import org.screamingsandals.lib.spectator.Component; import java.net.InetAddress; @@ -34,7 +33,7 @@ @RequiredArgsConstructor @EqualsAndHashCode(onlyExplicitlyIncluded = true) @ToString(onlyExplicitlyIncluded = true) -public class BukkitServerListPingEvent implements ServerListPingEvent, BukkitCancellable { +public class BukkitServerListPingEvent implements ServerListPingEvent { @Getter @EqualsAndHashCode.Include @ToString.Include diff --git a/core/common/src/main/java/org/screamingsandals/lib/event/server/ServerListPingEvent.java b/core/common/src/main/java/org/screamingsandals/lib/event/server/ServerListPingEvent.java index 5a0181ac..2ae19f81 100644 --- a/core/common/src/main/java/org/screamingsandals/lib/event/server/ServerListPingEvent.java +++ b/core/common/src/main/java/org/screamingsandals/lib/event/server/ServerListPingEvent.java @@ -17,14 +17,14 @@ package org.screamingsandals.lib.event.server; import org.jetbrains.annotations.NotNull; -import org.screamingsandals.lib.event.CancellableEvent; +import org.screamingsandals.lib.event.Event; import org.screamingsandals.lib.event.PlatformEvent; import org.screamingsandals.lib.spectator.Component; import java.net.InetAddress; // TODO: move to shared-core? -public interface ServerListPingEvent extends CancellableEvent, PlatformEvent { +public interface ServerListPingEvent extends Event, PlatformEvent { @NotNull InetAddress address(); @NotNull Component description();