diff --git a/src/event/server/CommandEvent.php b/src/event/server/CommandEvent.php
index 1881ad4963..f8feb68088 100644
--- a/src/event/server/CommandEvent.php
+++ b/src/event/server/CommandEvent.php
@@ -26,6 +26,7 @@ namespace pocketmine\event\server;
 use pocketmine\command\CommandSender;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 
 /**
  * Called when any CommandSender runs a command, before it is parsed.
@@ -41,7 +42,7 @@ use pocketmine\event\CancellableTrait;
  *
  * The message DOES NOT begin with a slash.
  */
-class CommandEvent extends ServerEvent implements Cancellable{
+class CommandEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
 	public function __construct(
diff --git a/src/event/server/DataPacketDecodeEvent.php b/src/event/server/DataPacketDecodeEvent.php
index 44aefbb916..9a3b9be21e 100644
--- a/src/event/server/DataPacketDecodeEvent.php
+++ b/src/event/server/DataPacketDecodeEvent.php
@@ -25,13 +25,14 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 use pocketmine\network\mcpe\NetworkSession;
 
 /**
  * Called before a packet is decoded and handled by the network session.
  * Cancelling this event will drop the packet without decoding it, minimizing wasted CPU time.
  */
-class DataPacketDecodeEvent extends ServerEvent implements Cancellable{
+class DataPacketDecodeEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
 	public function __construct(
diff --git a/src/event/server/DataPacketReceiveEvent.php b/src/event/server/DataPacketReceiveEvent.php
index 17224003d6..41d2a2445c 100644
--- a/src/event/server/DataPacketReceiveEvent.php
+++ b/src/event/server/DataPacketReceiveEvent.php
@@ -25,10 +25,11 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ServerboundPacket;
 
-class DataPacketReceiveEvent extends ServerEvent implements Cancellable{
+class DataPacketReceiveEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
 	public function __construct(
diff --git a/src/event/server/DataPacketSendEvent.php b/src/event/server/DataPacketSendEvent.php
index 147d99db34..d469900157 100644
--- a/src/event/server/DataPacketSendEvent.php
+++ b/src/event/server/DataPacketSendEvent.php
@@ -25,6 +25,7 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
+use pocketmine\event\Event;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\utils\Utils;
@@ -32,7 +33,7 @@ use pocketmine\utils\Utils;
 /**
  * Called when packets are sent to network sessions.
  */
-class DataPacketSendEvent extends ServerEvent implements Cancellable{
+class DataPacketSendEvent extends Event implements Cancellable{
 	use CancellableTrait;
 
 	/**
diff --git a/src/event/server/LowMemoryEvent.php b/src/event/server/LowMemoryEvent.php
index aea9afa80c..a30e747e5c 100644
--- a/src/event/server/LowMemoryEvent.php
+++ b/src/event/server/LowMemoryEvent.php
@@ -23,13 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\event\server;
 
+use pocketmine\event\Event;
 use pocketmine\utils\Process;
 
 /**
  * Called when the server is in a low-memory state as defined by the properties
  * Plugins should free caches or other non-essential data.
  */
-class LowMemoryEvent extends ServerEvent{
+class LowMemoryEvent extends Event{
 	public function __construct(
 		private int $memory,
 		private int $memoryLimit,
diff --git a/src/event/server/NetworkInterfaceEvent.php b/src/event/server/NetworkInterfaceEvent.php
index 5c1675f19b..2278c1bc27 100644
--- a/src/event/server/NetworkInterfaceEvent.php
+++ b/src/event/server/NetworkInterfaceEvent.php
@@ -23,9 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\event\server;
 
+use pocketmine\event\Event;
 use pocketmine\network\NetworkInterface;
 
-class NetworkInterfaceEvent extends ServerEvent{
+class NetworkInterfaceEvent extends Event{
 	public function __construct(
 		protected NetworkInterface $interface
 	){}
diff --git a/src/event/server/QueryRegenerateEvent.php b/src/event/server/QueryRegenerateEvent.php
index c51bc50546..02146621a8 100644
--- a/src/event/server/QueryRegenerateEvent.php
+++ b/src/event/server/QueryRegenerateEvent.php
@@ -23,9 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\event\server;
 
+use pocketmine\event\Event;
 use pocketmine\network\query\QueryInfo;
 
-class QueryRegenerateEvent extends ServerEvent{
+class QueryRegenerateEvent extends Event{
 	public function __construct(private QueryInfo $queryInfo){}
 
 	public function getQueryInfo() : QueryInfo{
diff --git a/src/event/server/ServerEvent.php b/src/event/server/ServerEvent.php
deleted file mode 100644
index 97e79279d3..0000000000
--- a/src/event/server/ServerEvent.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-/**
- * Events related to the server core, like networking, stop, console commands
- */
-namespace pocketmine\event\server;
-
-use pocketmine\event\Event;
-
-abstract class ServerEvent extends Event{
-
-}
diff --git a/src/event/server/UpdateNotifyEvent.php b/src/event/server/UpdateNotifyEvent.php
index 9a36a8bc8e..f9b756546c 100644
--- a/src/event/server/UpdateNotifyEvent.php
+++ b/src/event/server/UpdateNotifyEvent.php
@@ -23,13 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\event\server;
 
+use pocketmine\event\Event;
 use pocketmine\updater\UpdateChecker;
 
 /**
  * Called when the update checker receives notification of an available PocketMine-MP update.
  * Plugins may use this event to perform actions when an update notification is received.
  */
-class UpdateNotifyEvent extends ServerEvent{
+class UpdateNotifyEvent extends Event{
 	public function __construct(private UpdateChecker $updater){}
 
 	public function getUpdater() : UpdateChecker{