diff --git a/src/main/java/net/minestom/server/event/CancellableEvent.java b/src/main/java/net/minestom/server/event/CancellableEvent.java index e04d9ea5b..8ae37b32b 100644 --- a/src/main/java/net/minestom/server/event/CancellableEvent.java +++ b/src/main/java/net/minestom/server/event/CancellableEvent.java @@ -3,7 +3,7 @@ package net.minestom.server.event; /** * Represents an {@link Event} which can be cancelled. */ -public interface CancellableEvent { +public interface CancellableEvent extends Event{ /** * Gets if the {@link Event} should be cancelled or not. diff --git a/src/main/java/net/minestom/server/event/Event.java b/src/main/java/net/minestom/server/event/Event.java index 047a6980e..6253a2cd4 100644 --- a/src/main/java/net/minestom/server/event/Event.java +++ b/src/main/java/net/minestom/server/event/Event.java @@ -3,9 +3,9 @@ package net.minestom.server.event; import net.minestom.server.event.handler.EventHandler; /** - * Object which can be listened to by an {@link EventHandler}. + * Event which can be listened to by an {@link EventHandler}. *
* Called using {@link EventHandler#callEvent(Class, Event)}.
*/
-public class Event {
+public interface Event {
}
diff --git a/src/main/java/net/minestom/server/event/EventListener.java b/src/main/java/net/minestom/server/event/EventListener.java
index b19b80d24..2c5379802 100644
--- a/src/main/java/net/minestom/server/event/EventListener.java
+++ b/src/main/java/net/minestom/server/event/EventListener.java
@@ -21,6 +21,10 @@ public class EventListener
* Could be used to unload the chunk internally in order to save memory.
*/
-public class PlayerChunkUnloadEvent extends Event implements PlayerEvent {
+public class PlayerChunkUnloadEvent implements PlayerEvent {
private final Player player;
private final int chunkX, chunkZ;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerCommandEvent.java b/src/main/java/net/minestom/server/event/player/PlayerCommandEvent.java
index a1507bc85..f63079a73 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerCommandEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerCommandEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called every time a player send a message starting by '/'.
*/
-public class PlayerCommandEvent extends Event implements PlayerEvent, CancellableEvent {
+public class PlayerCommandEvent implements PlayerEvent, CancellableEvent {
private final Player player;
private String command;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java b/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java
index 34ab1abf4..c1d06195f 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
/**
* Called when a player die in {@link Player#kill()}.
*/
-public class PlayerDeathEvent extends Event implements PlayerEvent {
+public class PlayerDeathEvent implements PlayerEvent {
private final Player player;
private Component deathText;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerDisconnectEvent.java b/src/main/java/net/minestom/server/event/player/PlayerDisconnectEvent.java
index fdfb5123c..acfe4898d 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerDisconnectEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerDisconnectEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player disconnect.
*/
-public class PlayerDisconnectEvent extends Event implements PlayerEvent {
+public class PlayerDisconnectEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerEatEvent.java b/src/main/java/net/minestom/server/event/player/PlayerEatEvent.java
index 28ead0f54..9983a4159 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerEatEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerEatEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player is finished eating.
*/
-public class PlayerEatEvent extends Event implements PlayerEvent {
+public class PlayerEatEvent implements PlayerEvent {
private final Player player;
private final ItemStack foodItem;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerEntityInteractEvent.java b/src/main/java/net/minestom/server/event/player/PlayerEntityInteractEvent.java
index 2b41ac1ba..a3f4f3c44 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerEntityInteractEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerEntityInteractEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a {@link Player} interacts (right-click) with an {@link Entity}.
*/
-public class PlayerEntityInteractEvent extends Event implements PlayerEvent {
+public class PlayerEntityInteractEvent implements PlayerEvent {
private final Player player;
private final Entity entityTarget;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerHandAnimationEvent.java b/src/main/java/net/minestom/server/event/player/PlayerHandAnimationEvent.java
index 735ba6232..af0538a38 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerHandAnimationEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerHandAnimationEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when the player swings his hand.
*/
-public class PlayerHandAnimationEvent extends Event implements PlayerEvent, CancellableEvent {
+public class PlayerHandAnimationEvent implements PlayerEvent, CancellableEvent {
private final Player player;
private final Player.Hand hand;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerItemAnimationEvent.java b/src/main/java/net/minestom/server/event/player/PlayerItemAnimationEvent.java
index 8f8cfb4f0..c6e223c73 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerItemAnimationEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerItemAnimationEvent.java
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
*
* @see ItemAnimationType
*/
-public class PlayerItemAnimationEvent extends Event implements PlayerEvent, CancellableEvent {
+public class PlayerItemAnimationEvent implements PlayerEvent, CancellableEvent {
private final Player player;
private final ItemAnimationType armAnimationType;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerLoginEvent.java b/src/main/java/net/minestom/server/event/player/PlayerLoginEvent.java
index e55e1fb64..7de2e246d 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerLoginEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerLoginEvent.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
*
* WARNING: defining the spawning instance is MANDATORY.
*/
-public class PlayerLoginEvent extends Event implements PlayerEvent {
+public class PlayerLoginEvent implements PlayerEvent {
private final Player player;
private Instance spawningInstance;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java b/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java
index 1bd8e0ee6..36a8d942f 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player is modifying his position.
*/
-public class PlayerMoveEvent extends Event implements PlayerEvent, CancellableEvent {
+public class PlayerMoveEvent implements PlayerEvent, CancellableEvent {
private final Player player;
private Position newPosition;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerPluginMessageEvent.java b/src/main/java/net/minestom/server/event/player/PlayerPluginMessageEvent.java
index c72fff956..297829653 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerPluginMessageEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerPluginMessageEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player send {@link net.minestom.server.network.packet.client.play.ClientPluginMessagePacket}.
*/
-public class PlayerPluginMessageEvent extends Event implements PlayerEvent {
+public class PlayerPluginMessageEvent implements PlayerEvent {
private final Player player;
private final String identifier;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java b/src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java
index 69fb087d9..9fd8ff8cf 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
* or to cancel its processing, cancelling the event means that the player will
* continue the animation indefinitely.
*/
-public class PlayerPreEatEvent extends Event implements PlayerEvent, CancellableEvent {
+public class PlayerPreEatEvent implements PlayerEvent, CancellableEvent {
private final Player player;
private final ItemStack foodItem;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/net/minestom/server/event/player/PlayerResourcePackStatusEvent.java
index a2f516598..f9d00430e 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerResourcePackStatusEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerResourcePackStatusEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player warns the server of a resource pack status.
*/
-public class PlayerResourcePackStatusEvent extends Event implements PlayerEvent {
+public class PlayerResourcePackStatusEvent implements PlayerEvent {
private final Player player;
private final ResourcePackStatus status;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java b/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java
index f7d4e9200..a064e0efb 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
* Called when {@link Player#respawn()} is executed (for custom respawn or as a result of
* {@link net.minestom.server.network.packet.client.play.ClientStatusPacket}
*/
-public class PlayerRespawnEvent extends Event implements PlayerEvent {
+public class PlayerRespawnEvent implements PlayerEvent {
private final Player player;
private Position respawnPosition;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerSettingsChangeEvent.java b/src/main/java/net/minestom/server/event/player/PlayerSettingsChangeEvent.java
index fdb4f3d94..18cb592ac 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerSettingsChangeEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerSettingsChangeEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called after the player signals the server that his settings has been modified.
*/
-public class PlayerSettingsChangeEvent extends Event implements PlayerEvent {
+public class PlayerSettingsChangeEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerSkinInitEvent.java b/src/main/java/net/minestom/server/event/player/PlayerSkinInitEvent.java
index 0a1fb2ec6..0104d3dac 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerSkinInitEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerSkinInitEvent.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable;
/**
* Called at the player connection to initialize his skin.
*/
-public class PlayerSkinInitEvent extends Event implements PlayerEvent {
+public class PlayerSkinInitEvent implements PlayerEvent {
private final Player player;
private PlayerSkin skin;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerSpawnEvent.java b/src/main/java/net/minestom/server/event/player/PlayerSpawnEvent.java
index 6ed7c53b2..e975dc55a 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerSpawnEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerSpawnEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a new instance is set for a player.
*/
-public class PlayerSpawnEvent extends Event implements PlayerEvent {
+public class PlayerSpawnEvent implements PlayerEvent {
private final Player player;
private final Instance spawnInstance;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java
index 21a245937..4fe149a2c 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
* (could be because of high latency or a modified client) so cancelling {@link PlayerBlockBreakEvent} is also necessary.
* Could be fixed in future Minestom version.
*/
-public class PlayerStartDiggingEvent extends Event implements PlayerEvent, CancellableEvent {
+public class PlayerStartDiggingEvent implements PlayerEvent, CancellableEvent {
private final Player player;
private final BlockPosition blockPosition;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartFlyingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartFlyingEvent.java
index be8c94a02..5ab26e589 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStartFlyingEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStartFlyingEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player start flying.
*/
-public class PlayerStartFlyingEvent extends Event implements PlayerEvent {
+public class PlayerStartFlyingEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartFlyingWithElytraEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartFlyingWithElytraEvent.java
index 8d35e9afb..9b29bd1c2 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStartFlyingWithElytraEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStartFlyingWithElytraEvent.java
@@ -5,7 +5,7 @@ import net.minestom.server.event.Event;
import net.minestom.server.event.trait.PlayerEvent;
import org.jetbrains.annotations.NotNull;
-public class PlayerStartFlyingWithElytraEvent extends Event implements PlayerEvent {
+public class PlayerStartFlyingWithElytraEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartSneakingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartSneakingEvent.java
index 8e73326be..2e2c334ec 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStartSneakingEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStartSneakingEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player starts sneaking.
*/
-public class PlayerStartSneakingEvent extends Event implements PlayerEvent {
+public class PlayerStartSneakingEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartSprintingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartSprintingEvent.java
index 273f4c22a..0f5e27ccd 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStartSprintingEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStartSprintingEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player starts sprinting.
*/
-public class PlayerStartSprintingEvent extends Event implements PlayerEvent {
+public class PlayerStartSprintingEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStopFlyingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStopFlyingEvent.java
index 2b541e042..c2b8f449d 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStopFlyingEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStopFlyingEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player stop flying.
*/
-public class PlayerStopFlyingEvent extends Event implements PlayerEvent {
+public class PlayerStopFlyingEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStopFlyingWithElytraEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStopFlyingWithElytraEvent.java
index 320d7b2ad..d0715943a 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStopFlyingWithElytraEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStopFlyingWithElytraEvent.java
@@ -5,7 +5,7 @@ import net.minestom.server.event.Event;
import net.minestom.server.event.trait.PlayerEvent;
import org.jetbrains.annotations.NotNull;
-public class PlayerStopFlyingWithElytraEvent extends Event implements PlayerEvent {
+public class PlayerStopFlyingWithElytraEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStopSneakingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStopSneakingEvent.java
index d51200aba..47c461ed3 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStopSneakingEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStopSneakingEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player stops sneaking.
*/
-public class PlayerStopSneakingEvent extends Event implements PlayerEvent {
+public class PlayerStopSneakingEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerStopSprintingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStopSprintingEvent.java
index 72e1eca23..6e1e05b26 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerStopSprintingEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerStopSprintingEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player stops sprinting.
*/
-public class PlayerStopSprintingEvent extends Event implements PlayerEvent {
+public class PlayerStopSprintingEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerSwapItemEvent.java b/src/main/java/net/minestom/server/event/player/PlayerSwapItemEvent.java
index 824ac5791..c1533801b 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerSwapItemEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerSwapItemEvent.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Called when a player is trying to swap his main and off hand item.
*/
-public class PlayerSwapItemEvent extends Event implements PlayerEvent, CancellableEvent {
+public class PlayerSwapItemEvent implements PlayerEvent, CancellableEvent {
private final Player player;
private ItemStack mainHandItem;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerTickEvent.java b/src/main/java/net/minestom/server/event/player/PlayerTickEvent.java
index 92e62c94b..57472ba7a 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerTickEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerTickEvent.java
@@ -1,14 +1,13 @@
package net.minestom.server.event.player;
import net.minestom.server.entity.Player;
-import net.minestom.server.event.Event;
import net.minestom.server.event.trait.PlayerEvent;
import org.jetbrains.annotations.NotNull;
/**
* Called at each player tick.
*/
-public class PlayerTickEvent extends Event implements PlayerEvent {
+public class PlayerTickEvent implements PlayerEvent {
private final Player player;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerUseItemEvent.java b/src/main/java/net/minestom/server/event/player/PlayerUseItemEvent.java
index 95404ca84..54108d29f 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerUseItemEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerUseItemEvent.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Event when an item is used without clicking on a block.
*/
-public class PlayerUseItemEvent extends Event implements PlayerEvent, CancellableEvent {
+public class PlayerUseItemEvent implements PlayerEvent, CancellableEvent {
private final Player player;
private final Player.Hand hand;
diff --git a/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java b/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java
index 41345e6cd..b329a5b76 100644
--- a/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java
+++ b/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Used when a player is clicking on a block with an item (but is not a block in item form).
*/
-public class PlayerUseItemOnBlockEvent extends Event implements PlayerEvent {
+public class PlayerUseItemOnBlockEvent implements PlayerEvent {
private final Player player;
private final Player.Hand hand;
diff --git a/src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java b/src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java
index a68777609..38ddedf7e 100644
--- a/src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java
+++ b/src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java
@@ -4,7 +4,7 @@ import net.minestom.server.event.Event;
import net.minestom.server.network.packet.server.play.TagsPacket;
import org.jetbrains.annotations.NotNull;
-public class UpdateTagListEvent extends Event {
+public class UpdateTagListEvent implements Event {
private TagsPacket packet;
diff --git a/src/main/java/net/minestom/server/event/server/ServerListPingEvent.java b/src/main/java/net/minestom/server/event/server/ServerListPingEvent.java
index bc5f81f54..ab9551152 100644
--- a/src/main/java/net/minestom/server/event/server/ServerListPingEvent.java
+++ b/src/main/java/net/minestom/server/event/server/ServerListPingEvent.java
@@ -2,7 +2,6 @@ package net.minestom.server.event.server;
import net.minestom.server.MinecraftServer;
import net.minestom.server.event.CancellableEvent;
-import net.minestom.server.event.Event;
import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.ping.ResponseData;
import net.minestom.server.ping.ResponseDataConsumer;
@@ -16,7 +15,7 @@ import java.util.Objects;
* Called when a {@link PlayerConnection} sends a status packet,
* usually to display information on the server list.
*/
-public class ServerListPingEvent extends Event implements CancellableEvent {
+public class ServerListPingEvent implements CancellableEvent {
private final PlayerConnection connection;
private final ServerListPingType type;
@@ -36,7 +35,7 @@ public class ServerListPingEvent extends Event implements CancellableEvent {
* Creates a new server list ping event.
*
* @param connection the player connection, if the ping type is modern
- * @param type the ping type to respond with
+ * @param type the ping type to respond with
*/
public ServerListPingEvent(@Nullable PlayerConnection connection, @NotNull ServerListPingType type) {
//noinspection deprecation we need to continue doing this until the consumer is removed - todo remove
@@ -86,7 +85,7 @@ public class ServerListPingEvent extends Event implements CancellableEvent {
* @return the ping type
*/
public @NotNull ServerListPingType getPingType() {
- return type;
+ return type;
}
@Override
diff --git a/src/main/java/net/minestom/server/event/trait/EventTrait.java b/src/main/java/net/minestom/server/event/trait/EventTrait.java
index ad07db749..1b5732094 100644
--- a/src/main/java/net/minestom/server/event/trait/EventTrait.java
+++ b/src/main/java/net/minestom/server/event/trait/EventTrait.java
@@ -1,4 +1,6 @@
package net.minestom.server.event.trait;
-public interface EventTrait {
+import net.minestom.server.event.Event;
+
+public interface EventTrait extends Event {
}
diff --git a/src/main/java/net/minestom/server/extras/query/event/QueryEvent.java b/src/main/java/net/minestom/server/extras/query/event/QueryEvent.java
index d8365c1ba..88569c687 100644
--- a/src/main/java/net/minestom/server/extras/query/event/QueryEvent.java
+++ b/src/main/java/net/minestom/server/extras/query/event/QueryEvent.java
@@ -1,7 +1,6 @@
package net.minestom.server.extras.query.event;
import net.minestom.server.event.CancellableEvent;
-import net.minestom.server.event.Event;
import net.minestom.server.utils.binary.Writeable;
import org.jetbrains.annotations.NotNull;
@@ -13,7 +12,7 @@ import java.util.Objects;
*
* @param