diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 8ed1746f4..4d4915ba2 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -103,6 +103,7 @@ use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
 use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
 use pocketmine\network\mcpe\protocol\BookEditPacket;
 use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\EntityEventPacket;
 use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
@@ -112,7 +113,6 @@ use pocketmine\network\mcpe\protocol\MobEffectPacket;
 use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
 use pocketmine\network\mcpe\protocol\NetworkChunkPublisherUpdatePacket;
-use pocketmine\network\mcpe\protocol\Packet;
 use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
 use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
 use pocketmine\network\mcpe\protocol\SetTitlePacket;
@@ -2546,12 +2546,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	/**
-	 * @param Packet $packet
-	 * @param bool   $immediate
+	 * @param ClientboundPacket $packet
+	 * @param bool              $immediate
 	 *
 	 * @return bool
 	 */
-	public function sendDataPacket(Packet $packet, bool $immediate = false) : bool{
+	public function sendDataPacket(ClientboundPacket $packet, bool $immediate = false) : bool{
 		if(!$this->isConnected()){
 			return false;
 		}
@@ -2568,11 +2568,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * @deprecated This is a proxy for sendDataPacket() and will be removed in the next major release.
 	 * @see Player::sendDataPacket()
 	 *
-	 * @param Packet $packet
+	 * @param ClientboundPacket $packet
 	 *
 	 * @return bool
 	 */
-	public function dataPacket(Packet $packet) : bool{
+	public function dataPacket(ClientboundPacket $packet) : bool{
 		return $this->sendDataPacket($packet, false);
 	}
 
diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index f79d470a1..b838ff906 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -75,7 +75,7 @@ use pocketmine\network\mcpe\NetworkCipher;
 use pocketmine\network\mcpe\NetworkCompression;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\PacketStream;
-use pocketmine\network\mcpe\protocol\Packet;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
@@ -1535,18 +1535,18 @@ class Server{
 	/**
 	 * Broadcasts a Minecraft packet to a list of players
 	 *
-	 * @param Player[] $players
-	 * @param Packet   $packet
+	 * @param Player[]          $players
+	 * @param ClientboundPacket $packet
 	 *
 	 * @return bool
 	 */
-	public function broadcastPacket(array $players, Packet $packet) : bool{
+	public function broadcastPacket(array $players, ClientboundPacket $packet) : bool{
 		return $this->broadcastPackets($players, [$packet]);
 	}
 
 	/**
-	 * @param Player[]     $players
-	 * @param Packet[] $packets
+	 * @param Player[]            $players
+	 * @param ClientboundPacket[] $packets
 	 *
 	 * @return bool
 	 */
diff --git a/src/pocketmine/event/server/DataPacketBroadcastEvent.php b/src/pocketmine/event/server/DataPacketBroadcastEvent.php
index 364b45c55..d42d6ea3f 100644
--- a/src/pocketmine/event/server/DataPacketBroadcastEvent.php
+++ b/src/pocketmine/event/server/DataPacketBroadcastEvent.php
@@ -25,7 +25,7 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
-use pocketmine\network\mcpe\protocol\Packet;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\Player;
 
 /**
@@ -36,12 +36,12 @@ class DataPacketBroadcastEvent extends ServerEvent implements Cancellable{
 
 	/** @var Player[] */
 	private $players;
-	/** @var Packet[] */
+	/** @var ClientboundPacket[] */
 	private $packets;
 
 	/**
-	 * @param Player[] $players
-	 * @param Packet[] $packets
+	 * @param Player[]            $players
+	 * @param ClientboundPacket[] $packets
 	 */
 	public function __construct(array $players, array $packets){
 		$this->players = $players;
@@ -63,14 +63,14 @@ class DataPacketBroadcastEvent extends ServerEvent implements Cancellable{
 	}
 
 	/**
-	 * @return Packet[]
+	 * @return ClientboundPacket[]
 	 */
 	public function getPackets() : array{
 		return $this->packets;
 	}
 
 	/**
-	 * @param Packet[] $packets
+	 * @param ClientboundPacket[] $packets
 	 */
 	public function setPackets(array $packets) : void{
 		$this->packets = $packets;
diff --git a/src/pocketmine/event/server/DataPacketReceiveEvent.php b/src/pocketmine/event/server/DataPacketReceiveEvent.php
index 8ed8e2de0..946cd7ee9 100644
--- a/src/pocketmine/event/server/DataPacketReceiveEvent.php
+++ b/src/pocketmine/event/server/DataPacketReceiveEvent.php
@@ -25,30 +25,30 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
-use pocketmine\network\mcpe\protocol\Packet;
+use pocketmine\network\mcpe\protocol\ServerboundPacket;
 use pocketmine\Player;
 
 class DataPacketReceiveEvent extends ServerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var Packet */
+	/** @var ServerboundPacket */
 	private $packet;
 	/** @var Player */
 	private $player;
 
 	/**
-	 * @param Player $player
-	 * @param Packet $packet
+	 * @param Player            $player
+	 * @param ServerboundPacket $packet
 	 */
-	public function __construct(Player $player, Packet $packet){
+	public function __construct(Player $player, ServerboundPacket $packet){
 		$this->packet = $packet;
 		$this->player = $player;
 	}
 
 	/**
-	 * @return Packet
+	 * @return ServerboundPacket
 	 */
-	public function getPacket() : Packet{
+	public function getPacket() : ServerboundPacket{
 		return $this->packet;
 	}
 
diff --git a/src/pocketmine/event/server/DataPacketSendEvent.php b/src/pocketmine/event/server/DataPacketSendEvent.php
index 32c839900..c14b16037 100644
--- a/src/pocketmine/event/server/DataPacketSendEvent.php
+++ b/src/pocketmine/event/server/DataPacketSendEvent.php
@@ -25,30 +25,30 @@ namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
-use pocketmine\network\mcpe\protocol\Packet;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\Player;
 
 class DataPacketSendEvent extends ServerEvent implements Cancellable{
 	use CancellableTrait;
 
-	/** @var Packet */
+	/** @var ClientboundPacket */
 	private $packet;
 	/** @var Player */
 	private $player;
 
 	/**
-	 * @param Player $player
-	 * @param Packet $packet
+	 * @param Player            $player
+	 * @param ClientboundPacket $packet
 	 */
-	public function __construct(Player $player, Packet $packet){
+	public function __construct(Player $player, ClientboundPacket $packet){
 		$this->packet = $packet;
 		$this->player = $player;
 	}
 
 	/**
-	 * @return Packet
+	 * @return ClientboundPacket
 	 */
-	public function getPacket() : Packet{
+	public function getPacket() : ClientboundPacket{
 		return $this->packet;
 	}
 
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 94ba6eb21..47d9dd04a 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -73,9 +73,9 @@ use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\mcpe\ChunkRequestTask;
 use pocketmine\network\mcpe\CompressBatchPromise;
 use pocketmine\network\mcpe\protocol\AddEntityPacket;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
-use pocketmine\network\mcpe\protocol\Packet;
 use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
 use pocketmine\network\mcpe\protocol\SetTimePacket;
 use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
@@ -180,9 +180,9 @@ class Level implements ChunkManager, Metadatable{
 	/** @var Player[][] */
 	private $playerLoaders = [];
 
-	/** @var Packet[][] */
+	/** @var ClientboundPacket[][] */
 	private $chunkPackets = [];
-	/** @var Packet[] */
+	/** @var ClientboundPacket[] */
 	private $globalPackets = [];
 
 	/** @var float[] */
@@ -598,11 +598,11 @@ class Level implements ChunkManager, Metadatable{
 	 * Queues a packet to be sent to all players using the chunk at the specified X/Z coordinates at the end of the
 	 * current tick.
 	 *
-	 * @param int    $chunkX
-	 * @param int    $chunkZ
-	 * @param Packet $packet
+	 * @param int               $chunkX
+	 * @param int               $chunkZ
+	 * @param ClientboundPacket $packet
 	 */
-	public function addChunkPacket(int $chunkX, int $chunkZ, Packet $packet){
+	public function addChunkPacket(int $chunkX, int $chunkZ, ClientboundPacket $packet){
 		if(!isset($this->chunkPackets[$index = Level::chunkHash($chunkX, $chunkZ)])){
 			$this->chunkPackets[$index] = [$packet];
 		}else{
@@ -613,19 +613,19 @@ class Level implements ChunkManager, Metadatable{
 	/**
 	 * Broadcasts a packet to every player who has the target position within their view distance.
 	 *
-	 * @param Vector3 $pos
-	 * @param Packet  $packet
+	 * @param Vector3           $pos
+	 * @param ClientboundPacket $packet
 	 */
-	public function broadcastPacketToViewers(Vector3 $pos, Packet $packet) : void{
+	public function broadcastPacketToViewers(Vector3 $pos, ClientboundPacket $packet) : void{
 		$this->addChunkPacket($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4, $packet);
 	}
 
 	/**
 	 * Broadcasts a packet to every player in the level.
 	 *
-	 * @param Packet $packet
+	 * @param ClientboundPacket $packet
 	 */
-	public function broadcastGlobalPacket(Packet $packet) : void{
+	public function broadcastGlobalPacket(ClientboundPacket $packet) : void{
 		$this->globalPackets[] = $packet;
 	}
 
diff --git a/src/pocketmine/level/particle/Particle.php b/src/pocketmine/level/particle/Particle.php
index cef6dbcc8..ccf97d35b 100644
--- a/src/pocketmine/level/particle/Particle.php
+++ b/src/pocketmine/level/particle/Particle.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\level\particle;
 
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\protocol\Packet;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
 
 abstract class Particle{
 
@@ -86,7 +86,7 @@ abstract class Particle{
 	/**
 	 * @param Vector3 $pos
 	 *
-	 * @return Packet|Packet[]
+	 * @return ClientboundPacket|ClientboundPacket[]
 	 */
 	abstract public function encode(Vector3 $pos);
 
diff --git a/src/pocketmine/level/sound/Sound.php b/src/pocketmine/level/sound/Sound.php
index 8cf77770d..20b7533ae 100644
--- a/src/pocketmine/level/sound/Sound.php
+++ b/src/pocketmine/level/sound/Sound.php
@@ -24,14 +24,14 @@ declare(strict_types=1);
 namespace pocketmine\level\sound;
 
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\protocol\Packet;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
 
 abstract class Sound{
 
 	/**
 	 * @param Vector3 $pos
 	 *
-	 * @return Packet|Packet[]
+	 * @return ClientboundPacket|ClientboundPacket[]
 	 */
 	abstract public function encode(Vector3 $pos);
 
diff --git a/src/pocketmine/network/mcpe/NetworkSession.php b/src/pocketmine/network/mcpe/NetworkSession.php
index f91e327e2..0d4a9e404 100644
--- a/src/pocketmine/network/mcpe/NetworkSession.php
+++ b/src/pocketmine/network/mcpe/NetworkSession.php
@@ -34,10 +34,12 @@ use pocketmine\network\mcpe\handler\PreSpawnSessionHandler;
 use pocketmine\network\mcpe\handler\ResourcePacksSessionHandler;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\handler\SimpleSessionHandler;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\DisconnectPacket;
 use pocketmine\network\mcpe\protocol\Packet;
 use pocketmine\network\mcpe\protocol\PacketPool;
 use pocketmine\network\mcpe\protocol\PlayStatusPacket;
+use pocketmine\network\mcpe\protocol\ServerboundPacket;
 use pocketmine\network\mcpe\protocol\ServerToClientHandshakePacket;
 use pocketmine\network\NetworkInterface;
 use pocketmine\Player;
@@ -214,6 +216,10 @@ class NetworkSession{
 	 * @throws BadPacketException
 	 */
 	public function handleDataPacket(Packet $packet) : void{
+		if(!($packet instanceof ServerboundPacket)){
+			throw new BadPacketException("Unexpected non-serverbound packet " . $packet->getName());
+		}
+
 		$timings = Timings::getReceiveDataPacketTimings($packet);
 		$timings->startTiming();
 
@@ -237,7 +243,7 @@ class NetworkSession{
 		$timings->stopTiming();
 	}
 
-	public function sendDataPacket(Packet $packet, bool $immediate = false) : bool{
+	public function sendDataPacket(ClientboundPacket $packet, bool $immediate = false) : bool{
 		$timings = Timings::getSendDataPacketTimings($packet);
 		$timings->startTiming();
 		try{
@@ -260,9 +266,9 @@ class NetworkSession{
 
 	/**
 	 * @internal
-	 * @param Packet $packet
+	 * @param ClientboundPacket $packet
 	 */
-	public function addToSendBuffer(Packet $packet) : void{
+	public function addToSendBuffer(ClientboundPacket $packet) : void{
 		$timings = Timings::getSendDataPacketTimings($packet);
 		$timings->startTiming();
 		try{
diff --git a/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php b/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php
index 8472b1b45..863880bef 100644
--- a/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class AddBehaviorTreePacket extends DataPacket{
+class AddBehaviorTreePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ADD_BEHAVIOR_TREE_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php
index 6a417a587..56b95fcb2 100644
--- a/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php
@@ -34,7 +34,7 @@ use pocketmine\network\mcpe\protocol\types\EntityLink;
 use function array_search;
 use function count;
 
-class AddEntityPacket extends DataPacket{
+class AddEntityPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ADD_ENTITY_PACKET;
 
 	/*
diff --git a/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php
index 032de9f55..07f575ace 100644
--- a/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class AddHangingEntityPacket extends DataPacket{
+class AddHangingEntityPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ADD_HANGING_ENTITY_PACKET;
 
 	/** @var int|null */
diff --git a/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php
index ff1a32dbd..9ee9a2d10 100644
--- a/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php
@@ -29,7 +29,7 @@ use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class AddItemEntityPacket extends DataPacket{
+class AddItemEntityPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ADD_ITEM_ENTITY_PACKET;
 
 	/** @var int|null */
diff --git a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php
index cb80125c7..693009353 100644
--- a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php
@@ -32,7 +32,7 @@ use pocketmine\network\mcpe\protocol\types\EntityLink;
 use pocketmine\utils\UUID;
 use function count;
 
-class AddPlayerPacket extends DataPacket{
+class AddPlayerPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ADD_PLAYER_PACKET;
 
 	/** @var UUID */
diff --git a/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php
index b98739fde..43eaa4e9f 100644
--- a/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
 
-class AdventureSettingsPacket extends DataPacket{
+class AdventureSettingsPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ADVENTURE_SETTINGS_PACKET;
 
 	public const PERMISSION_NORMAL = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/AnimatePacket.php b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php
index 22ec0ccd0..49f9c59bc 100644
--- a/src/pocketmine/network/mcpe/protocol/AnimatePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class AnimatePacket extends DataPacket{
+class AnimatePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ANIMATE_PACKET;
 
 	public const ACTION_SWING_ARM = 1;
diff --git a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php
index e2458df49..c67601e2f 100644
--- a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php
@@ -39,7 +39,7 @@ use function array_values;
 use function count;
 use function dechex;
 
-class AvailableCommandsPacket extends DataPacket{
+class AvailableCommandsPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::AVAILABLE_COMMANDS_PACKET;
 
 
diff --git a/src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php
index 194094f25..e5ba51e19 100644
--- a/src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function base64_decode;
 
-class AvailableEntityIdentifiersPacket extends DataPacket{
+class AvailableEntityIdentifiersPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::AVAILABLE_ENTITY_IDENTIFIERS_PACKET;
 
 	/**
diff --git a/src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php b/src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php
index e518a148f..018afab65 100644
--- a/src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class BiomeDefinitionListPacket extends DataPacket{
+class BiomeDefinitionListPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::BIOME_DEFINITION_LIST_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php
index 6e06e38b2..663c24227 100644
--- a/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class BlockEntityDataPacket extends DataPacket{
+class BlockEntityDataPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::BLOCK_ENTITY_DATA_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php
index 462e4d9e5..755b971e2 100644
--- a/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class BlockEventPacket extends DataPacket{
+class BlockEventPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::BLOCK_EVENT_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php b/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php
index 1bc27cef1..8bd44a725 100644
--- a/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class BlockPickRequestPacket extends DataPacket{
+class BlockPickRequestPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::BLOCK_PICK_REQUEST_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php
index f1b0a0851..38eed556a 100644
--- a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\BadPacketException;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class BookEditPacket extends DataPacket{
+class BookEditPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::BOOK_EDIT_PACKET;
 
 	public const TYPE_REPLACE_PAGE = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/BossEventPacket.php b/src/pocketmine/network/mcpe/protocol/BossEventPacket.php
index 89a9be354..4a3c50eab 100644
--- a/src/pocketmine/network/mcpe/protocol/BossEventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/BossEventPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class BossEventPacket extends DataPacket{
+class BossEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::BOSS_EVENT_PACKET;
 
 	/* S2C: Shows the boss-bar to the player. */
diff --git a/src/pocketmine/network/mcpe/protocol/CameraPacket.php b/src/pocketmine/network/mcpe/protocol/CameraPacket.php
index 6e211d516..ddca6dd15 100644
--- a/src/pocketmine/network/mcpe/protocol/CameraPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/CameraPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class CameraPacket extends DataPacket{
+class CameraPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CAMERA_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php
index 90f487000..6e13a7296 100644
--- a/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ChangeDimensionPacket extends DataPacket{
+class ChangeDimensionPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CHANGE_DIMENSION_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php
index cf6ec6ef8..7fe8c056b 100644
--- a/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ChunkRadiusUpdatedPacket extends DataPacket{
+class ChunkRadiusUpdatedPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CHUNK_RADIUS_UPDATED_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php b/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php
index 0e42af7bb..e744ff0ff 100644
--- a/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ClientToServerHandshakePacket extends DataPacket{
+class ClientToServerHandshakePacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CLIENT_TO_SERVER_HANDSHAKE_PACKET;
 
 	public function canBeSentBeforeLogin() : bool{
diff --git a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php
index c068b50ef..6c716ffaa 100644
--- a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php
@@ -35,7 +35,7 @@ use pocketmine\utils\Color;
 use function assert;
 use function count;
 
-class ClientboundMapItemDataPacket extends DataPacket{
+class ClientboundMapItemDataPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CLIENTBOUND_MAP_ITEM_DATA_PACKET;
 
 	public const BITFLAG_TEXTURE_UPDATE = 0x02;
diff --git a/src/pocketmine/network/mcpe/protocol/ClientboundPacket.php b/src/pocketmine/network/mcpe/protocol/ClientboundPacket.php
new file mode 100644
index 000000000..edd22bf0e
--- /dev/null
+++ b/src/pocketmine/network/mcpe/protocol/ClientboundPacket.php
@@ -0,0 +1,28 @@
+<?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);
+
+namespace pocketmine\network\mcpe\protocol;
+
+interface ClientboundPacket extends Packet{
+
+}
diff --git a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php
index d3c5a607d..bdb04ce4a 100644
--- a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class CommandBlockUpdatePacket extends DataPacket{
+class CommandBlockUpdatePacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::COMMAND_BLOCK_UPDATE_PACKET;
 
 	/** @var bool */
diff --git a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php
index c4afe4ca6..e310b0ac0 100644
--- a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php
@@ -31,7 +31,7 @@ use pocketmine\network\mcpe\protocol\types\CommandOutputMessage;
 use pocketmine\utils\BinaryDataException;
 use function count;
 
-class CommandOutputPacket extends DataPacket{
+class CommandOutputPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::COMMAND_OUTPUT_PACKET;
 
 	/** @var CommandOriginData */
diff --git a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php
index 11312d815..cdb5d7577 100644
--- a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\protocol\types\CommandOriginData;
 
-class CommandRequestPacket extends DataPacket{
+class CommandRequestPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::COMMAND_REQUEST_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php
index 679b9f92f..55132bf99 100644
--- a/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ContainerClosePacket extends DataPacket{
+class ContainerClosePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CONTAINER_CLOSE_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php
index 82fd3a18f..eb7b893a4 100644
--- a/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ContainerOpenPacket extends DataPacket{
+class ContainerOpenPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CONTAINER_OPEN_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php
index 08a83861f..f3435a6c6 100644
--- a/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ContainerSetDataPacket extends DataPacket{
+class ContainerSetDataPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CONTAINER_SET_DATA_PACKET;
 
 	public const PROPERTY_FURNACE_TICK_COUNT = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php
index 490db90d9..f3940dd82 100644
--- a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php
@@ -36,7 +36,7 @@ use pocketmine\network\mcpe\NetworkBinaryStream;
 use function count;
 use function str_repeat;
 
-class CraftingDataPacket extends DataPacket{
+class CraftingDataPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CRAFTING_DATA_PACKET;
 
 	public const ENTRY_SHAPELESS = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php
index 90d0a6a74..62df96753 100644
--- a/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php
@@ -30,7 +30,7 @@ use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\utils\UUID;
 use function count;
 
-class CraftingEventPacket extends DataPacket{
+class CraftingEventPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::CRAFTING_EVENT_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php
index 722efbe2d..437ec6b90 100644
--- a/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class DisconnectPacket extends DataPacket{
+class DisconnectPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::DISCONNECT_PACKET;
 
 	/** @var bool */
diff --git a/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php
index b6ff4173a..8a87b490a 100644
--- a/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class EntityEventPacket extends DataPacket{
+class EntityEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ENTITY_EVENT_PACKET;
 
 	public const HURT_ANIMATION = 2;
diff --git a/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php b/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php
index 4c0001df8..0eede0be9 100644
--- a/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class EntityFallPacket extends DataPacket{
+class EntityFallPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ENTITY_FALL_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php b/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php
index f2d1a89aa..bb167e3d0 100644
--- a/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class EntityPickRequestPacket extends DataPacket{
+class EntityPickRequestPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::ENTITY_PICK_REQUEST_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/EventPacket.php b/src/pocketmine/network/mcpe/protocol/EventPacket.php
index fa1e11778..67a518af6 100644
--- a/src/pocketmine/network/mcpe/protocol/EventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/EventPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class EventPacket extends DataPacket{
+class EventPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::EVENT_PACKET;
 
 	public const TYPE_ACHIEVEMENT_AWARDED = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/ExplodePacket.php b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php
index bff3a6a90..17a2141be 100644
--- a/src/pocketmine/network/mcpe/protocol/ExplodePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php
@@ -30,7 +30,7 @@ use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function count;
 
-class ExplodePacket extends DataPacket{
+class ExplodePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::EXPLODE_PACKET;
 
 	/** @var Vector3 */
diff --git a/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php
index f1528d161..2503772c8 100644
--- a/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class FullChunkDataPacket extends DataPacket{
+class FullChunkDataPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::FULL_CHUNK_DATA_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php b/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php
index a807e5cae..c6d9ce488 100644
--- a/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class GameRulesChangedPacket extends DataPacket{
+class GameRulesChangedPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::GAME_RULES_CHANGED_PACKET;
 
 	/** @var array */
diff --git a/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php b/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php
index f4e846bee..58ddf7810 100644
--- a/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class GuiDataPickItemPacket extends DataPacket{
+class GuiDataPickItemPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::GUI_DATA_PICK_ITEM_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php
index e55a7638d..a4d01bc45 100644
--- a/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class HurtArmorPacket extends DataPacket{
+class HurtArmorPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::HURT_ARMOR_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/InteractPacket.php b/src/pocketmine/network/mcpe/protocol/InteractPacket.php
index 184b583b8..10a87d787 100644
--- a/src/pocketmine/network/mcpe/protocol/InteractPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/InteractPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class InteractPacket extends DataPacket{
+class InteractPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::INTERACT_PACKET;
 
 	public const ACTION_LEAVE_VEHICLE = 3;
diff --git a/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php
index c9b8c1117..4e82aacea 100644
--- a/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php
@@ -29,7 +29,7 @@ use pocketmine\item\Item;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function count;
 
-class InventoryContentPacket extends DataPacket{
+class InventoryContentPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::INVENTORY_CONTENT_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php b/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php
index f6bf66435..4f21e7526 100644
--- a/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class InventorySlotPacket extends DataPacket{
+class InventorySlotPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::INVENTORY_SLOT_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php
index aad97a1d8..4e009d1c8 100644
--- a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php
@@ -37,7 +37,7 @@ use pocketmine\network\mcpe\protocol\types\UseItemTransactionData;
 /**
  * This packet effectively crams multiple packets into one.
  */
-class InventoryTransactionPacket extends DataPacket{
+class InventoryTransactionPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::INVENTORY_TRANSACTION_PACKET;
 
 	public const TYPE_NORMAL = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php
index 2b16febee..8890149cd 100644
--- a/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ItemFrameDropItemPacket extends DataPacket{
+class ItemFrameDropItemPacket extends DataPacket implements ServerboundPacket{
 
 	public const NETWORK_ID = ProtocolInfo::ITEM_FRAME_DROP_ITEM_PACKET;
 
diff --git a/src/pocketmine/network/mcpe/protocol/LabTablePacket.php b/src/pocketmine/network/mcpe/protocol/LabTablePacket.php
index 3291a7dae..f87385311 100644
--- a/src/pocketmine/network/mcpe/protocol/LabTablePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/LabTablePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class LabTablePacket extends DataPacket{
+class LabTablePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::LAB_TABLE_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php
index 01f422f81..aa3fc980c 100644
--- a/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class LevelEventPacket extends DataPacket{
+class LevelEventPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::LEVEL_EVENT_PACKET;
 
 	public const EVENT_SOUND_CLICK = 1000;
diff --git a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php
index 07ea15abe..9f5177e73 100644
--- a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class LevelSoundEventPacket extends DataPacket{
+class LevelSoundEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::LEVEL_SOUND_EVENT_PACKET;
 
 	public const SOUND_ITEM_USE_ON = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/LoginPacket.php b/src/pocketmine/network/mcpe/protocol/LoginPacket.php
index abdb2a55a..2f79362a2 100644
--- a/src/pocketmine/network/mcpe/protocol/LoginPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/LoginPacket.php
@@ -43,7 +43,7 @@ use function is_array;
 use function json_decode;
 use function json_last_error_msg;
 
-class LoginPacket extends DataPacket{
+class LoginPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::LOGIN_PACKET;
 
 	public const EDITION_POCKET = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php b/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php
index 04199d698..b6500c36f 100644
--- a/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class MapInfoRequestPacket extends DataPacket{
+class MapInfoRequestPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MAP_INFO_REQUEST_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php
index 214b73f83..5a4255eef 100644
--- a/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class MobArmorEquipmentPacket extends DataPacket{
+class MobArmorEquipmentPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MOB_ARMOR_EQUIPMENT_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php
index f95c5a098..c40509edb 100644
--- a/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class MobEffectPacket extends DataPacket{
+class MobEffectPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MOB_EFFECT_PACKET;
 
 	public const EVENT_ADD = 1;
diff --git a/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php
index 21661c6c4..6ea86df84 100644
--- a/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class MobEquipmentPacket extends DataPacket{
+class MobEquipmentPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MOB_EQUIPMENT_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php
index 92cc5d871..09a65c4f1 100644
--- a/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ModalFormRequestPacket extends DataPacket{
+class ModalFormRequestPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MODAL_FORM_REQUEST_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php
index 9300507c6..0ed1a2064 100644
--- a/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ModalFormResponsePacket extends DataPacket{
+class ModalFormResponsePacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MODAL_FORM_RESPONSE_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/MoveEntityAbsolutePacket.php b/src/pocketmine/network/mcpe/protocol/MoveEntityAbsolutePacket.php
index 34c1d1eab..63d550f16 100644
--- a/src/pocketmine/network/mcpe/protocol/MoveEntityAbsolutePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/MoveEntityAbsolutePacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class MoveEntityAbsolutePacket extends DataPacket{
+class MoveEntityAbsolutePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MOVE_ENTITY_ABSOLUTE_PACKET;
 
 	public const FLAG_GROUND = 0x01;
diff --git a/src/pocketmine/network/mcpe/protocol/MoveEntityDeltaPacket.php b/src/pocketmine/network/mcpe/protocol/MoveEntityDeltaPacket.php
index f799b60bd..929b9f831 100644
--- a/src/pocketmine/network/mcpe/protocol/MoveEntityDeltaPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/MoveEntityDeltaPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\utils\BinaryDataException;
 
-class MoveEntityDeltaPacket extends DataPacket{
+class MoveEntityDeltaPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MOVE_ENTITY_DELTA_PACKET;
 
 	public const FLAG_HAS_X = 0x01;
diff --git a/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php
index 24e998390..801e6de92 100644
--- a/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class MovePlayerPacket extends DataPacket{
+class MovePlayerPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MOVE_PLAYER_PACKET;
 
 	public const MODE_NORMAL = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/NetworkChunkPublisherUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/NetworkChunkPublisherUpdatePacket.php
index 0bb8717d3..7075d0dfa 100644
--- a/src/pocketmine/network/mcpe/protocol/NetworkChunkPublisherUpdatePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/NetworkChunkPublisherUpdatePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class NetworkChunkPublisherUpdatePacket extends DataPacket{
+class NetworkChunkPublisherUpdatePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::NETWORK_CHUNK_PUBLISHER_UPDATE_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/NetworkStackLatencyPacket.php b/src/pocketmine/network/mcpe/protocol/NetworkStackLatencyPacket.php
index 7021c6194..93ef9a3c4 100644
--- a/src/pocketmine/network/mcpe/protocol/NetworkStackLatencyPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/NetworkStackLatencyPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class NetworkStackLatencyPacket extends DataPacket{
+class NetworkStackLatencyPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::NETWORK_STACK_LATENCY_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php b/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php
index babe74f6d..d0a33b902 100644
--- a/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class NpcRequestPacket extends DataPacket{
+class NpcRequestPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::NPC_REQUEST_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php b/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php
index ce4f0d7c5..c278adc62 100644
--- a/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class PhotoTransferPacket extends DataPacket{
+class PhotoTransferPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PHOTO_TRANSFER_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php b/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php
index 27aa677b2..4fe95ae5c 100644
--- a/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class PlaySoundPacket extends DataPacket{
+class PlaySoundPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PLAY_SOUND_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php
index 9ce436f4f..83ca723c8 100644
--- a/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class PlayStatusPacket extends DataPacket{
+class PlayStatusPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PLAY_STATUS_PACKET;
 
 	public const LOGIN_SUCCESS = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php
index 92254d75b..a4d6af775 100644
--- a/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class PlayerActionPacket extends DataPacket{
+class PlayerActionPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PLAYER_ACTION_PACKET;
 
 	public const ACTION_START_BREAK = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php
index ffcacbb66..2d6a31063 100644
--- a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php
@@ -31,7 +31,7 @@ use pocketmine\network\mcpe\protocol\types\ContainerIds;
 /**
  * One of the most useless packets.
  */
-class PlayerHotbarPacket extends DataPacket{
+class PlayerHotbarPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PLAYER_HOTBAR_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php
index a08eae9b8..f2e4a69ea 100644
--- a/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class PlayerInputPacket extends DataPacket{
+class PlayerInputPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PLAYER_INPUT_PACKET;
 
 	/** @var float */
diff --git a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php
index f97a9cb54..2d0eeb4e1 100644
--- a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php
@@ -31,7 +31,7 @@ use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use function count;
 
-class PlayerListPacket extends DataPacket{
+class PlayerListPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PLAYER_LIST_PACKET;
 
 	public const TYPE_ADD = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php
index 554588d9f..066ae5828 100644
--- a/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php
@@ -29,7 +29,7 @@ use pocketmine\entity\Skin;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\utils\UUID;
 
-class PlayerSkinPacket extends DataPacket{
+class PlayerSkinPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PLAYER_SKIN_PACKET;
 
 	/** @var UUID */
diff --git a/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php b/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php
index 5e503bd2f..f34a5535e 100644
--- a/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function count;
 
-class PurchaseReceiptPacket extends DataPacket{
+class PurchaseReceiptPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::PURCHASE_RECEIPT_PACKET;
 
 	/** @var string[] */
diff --git a/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php
index 9925679e5..7aad4b7bc 100644
--- a/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class RemoveEntityPacket extends DataPacket{
+class RemoveEntityPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::REMOVE_ENTITY_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/RemoveObjectivePacket.php b/src/pocketmine/network/mcpe/protocol/RemoveObjectivePacket.php
index 3889f3b79..13872bfd8 100644
--- a/src/pocketmine/network/mcpe/protocol/RemoveObjectivePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/RemoveObjectivePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class RemoveObjectivePacket extends DataPacket{
+class RemoveObjectivePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::REMOVE_OBJECTIVE_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php
index 37cc96ee9..25117c3d4 100644
--- a/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class RequestChunkRadiusPacket extends DataPacket{
+class RequestChunkRadiusPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::REQUEST_CHUNK_RADIUS_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php
index a819eb415..0e6c3ab01 100644
--- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php
@@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function strlen;
 
-class ResourcePackChunkDataPacket extends DataPacket{
+class ResourcePackChunkDataPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CHUNK_DATA_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php
index 8d6d0188e..a343768ea 100644
--- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ResourcePackChunkRequestPacket extends DataPacket{
+class ResourcePackChunkRequestPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CHUNK_REQUEST_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php
index 2d76784d4..d757441b4 100644
--- a/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function count;
 
-class ResourcePackClientResponsePacket extends DataPacket{
+class ResourcePackClientResponsePacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CLIENT_RESPONSE_PACKET;
 
 	public const STATUS_REFUSED = 1;
diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php
index ba3d4a290..26882732f 100644
--- a/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ResourcePackDataInfoPacket extends DataPacket{
+class ResourcePackDataInfoPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_DATA_INFO_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php
index 27726a7f0..95fe5078e 100644
--- a/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php
@@ -31,7 +31,7 @@ use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\resourcepacks\ResourcePack;
 use function count;
 
-class ResourcePackStackPacket extends DataPacket{
+class ResourcePackStackPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_STACK_PACKET;
 
 	/** @var bool */
diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php
index 15b1b900f..f5565bef6 100644
--- a/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php
@@ -30,7 +30,7 @@ use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\resourcepacks\ResourcePack;
 use function count;
 
-class ResourcePacksInfoPacket extends DataPacket{
+class ResourcePacksInfoPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::RESOURCE_PACKS_INFO_PACKET;
 
 	/** @var bool */
diff --git a/src/pocketmine/network/mcpe/protocol/RespawnPacket.php b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php
index 7fb40ac2d..ad7b29540 100644
--- a/src/pocketmine/network/mcpe/protocol/RespawnPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class RespawnPacket extends DataPacket{
+class RespawnPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::RESPAWN_PACKET;
 
 	/** @var Vector3 */
diff --git a/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php
index f1eb66e62..8b5f922c9 100644
--- a/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class RiderJumpPacket extends DataPacket{
+class RiderJumpPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::RIDER_JUMP_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ScriptCustomEventPacket.php b/src/pocketmine/network/mcpe/protocol/ScriptCustomEventPacket.php
index 087f3298d..64301aff8 100644
--- a/src/pocketmine/network/mcpe/protocol/ScriptCustomEventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ScriptCustomEventPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ScriptCustomEventPacket extends DataPacket{
+class ScriptCustomEventPacket extends DataPacket{ //TODO: this doesn't have handlers in either client or server in the game as of 1.8
 	public const NETWORK_ID = ProtocolInfo::SCRIPT_CUSTOM_EVENT_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php
index c8513b3d0..003c02b8e 100644
--- a/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ServerSettingsRequestPacket extends DataPacket{
+class ServerSettingsRequestPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_REQUEST_PACKET;
 
 	protected function decodePayload() : void{
diff --git a/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php
index a1d374494..e05b02c13 100644
--- a/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ServerSettingsResponsePacket extends DataPacket{
+class ServerSettingsResponsePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_RESPONSE_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php b/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php
index c3fd0d9e6..9a223f18a 100644
--- a/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ServerToClientHandshakePacket extends DataPacket{
+class ServerToClientHandshakePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SERVER_TO_CLIENT_HANDSHAKE_PACKET;
 
 	/**
diff --git a/src/pocketmine/network/mcpe/protocol/ServerboundPacket.php b/src/pocketmine/network/mcpe/protocol/ServerboundPacket.php
new file mode 100644
index 000000000..26c083350
--- /dev/null
+++ b/src/pocketmine/network/mcpe/protocol/ServerboundPacket.php
@@ -0,0 +1,28 @@
+<?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);
+
+namespace pocketmine\network\mcpe\protocol;
+
+interface ServerboundPacket extends Packet{
+
+}
diff --git a/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php
index 1b4dcd1e9..0f91d88cf 100644
--- a/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetCommandsEnabledPacket extends DataPacket{
+class SetCommandsEnabledPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_COMMANDS_ENABLED_PACKET;
 
 	/** @var bool */
diff --git a/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php b/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php
index a52f2a26b..3fb28d464 100644
--- a/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetDefaultGameTypePacket extends DataPacket{
+class SetDefaultGameTypePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_DEFAULT_GAME_TYPE_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php
index e4becdd5f..79f71b10a 100644
--- a/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetDifficultyPacket extends DataPacket{
+class SetDifficultyPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_DIFFICULTY_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetDisplayObjectivePacket.php b/src/pocketmine/network/mcpe/protocol/SetDisplayObjectivePacket.php
index 3eb7b4a29..ed9406f16 100644
--- a/src/pocketmine/network/mcpe/protocol/SetDisplayObjectivePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetDisplayObjectivePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetDisplayObjectivePacket extends DataPacket{
+class SetDisplayObjectivePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_DISPLAY_OBJECTIVE_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php
index aa0206c96..500453955 100644
--- a/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetEntityDataPacket extends DataPacket{
+class SetEntityDataPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ //TODO: check why this is serverbound
 	public const NETWORK_ID = ProtocolInfo::SET_ENTITY_DATA_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php
index 577b2d1d7..58667275b 100644
--- a/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\protocol\types\EntityLink;
 
-class SetEntityLinkPacket extends DataPacket{
+class SetEntityLinkPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_ENTITY_LINK_PACKET;
 
 	/** @var EntityLink */
diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php
index 4d4eafe14..d0576a052 100644
--- a/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetEntityMotionPacket extends DataPacket{
+class SetEntityMotionPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_ENTITY_MOTION_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php
index c25f228d4..afb40982f 100644
--- a/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetHealthPacket extends DataPacket{
+class SetHealthPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_HEALTH_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php b/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php
index 5591b867a..e8fb632d3 100644
--- a/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetLastHurtByPacket extends DataPacket{
+class SetLastHurtByPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_LAST_HURT_BY_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetLocalPlayerAsInitializedPacket.php b/src/pocketmine/network/mcpe/protocol/SetLocalPlayerAsInitializedPacket.php
index 9d8652a69..5f278a286 100644
--- a/src/pocketmine/network/mcpe/protocol/SetLocalPlayerAsInitializedPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetLocalPlayerAsInitializedPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetLocalPlayerAsInitializedPacket extends DataPacket{
+class SetLocalPlayerAsInitializedPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_LOCAL_PLAYER_AS_INITIALIZED_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php
index 5c8ecb914..6ca085859 100644
--- a/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetPlayerGameTypePacket extends DataPacket{
+class SetPlayerGameTypePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_PLAYER_GAME_TYPE_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetScorePacket.php b/src/pocketmine/network/mcpe/protocol/SetScorePacket.php
index 1e8daa3f6..f0a912dee 100644
--- a/src/pocketmine/network/mcpe/protocol/SetScorePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetScorePacket.php
@@ -30,7 +30,7 @@ use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\protocol\types\ScorePacketEntry;
 use function count;
 
-class SetScorePacket extends DataPacket{
+class SetScorePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_SCORE_PACKET;
 
 	public const TYPE_CHANGE = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/SetScoreboardIdentityPacket.php b/src/pocketmine/network/mcpe/protocol/SetScoreboardIdentityPacket.php
index 5bbfc0dc5..9a5f7f219 100644
--- a/src/pocketmine/network/mcpe/protocol/SetScoreboardIdentityPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetScoreboardIdentityPacket.php
@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\protocol\types\ScoreboardIdentityPacketEntry;
 use function count;
 
-class SetScoreboardIdentityPacket extends DataPacket{
+class SetScoreboardIdentityPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_SCOREBOARD_IDENTITY_PACKET;
 
 	public const TYPE_REGISTER_IDENTITY = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php
index 4ebb0edeb..21240dd57 100644
--- a/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetSpawnPositionPacket extends DataPacket{
+class SetSpawnPositionPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_SPAWN_POSITION_PACKET;
 
 	public const TYPE_PLAYER_SPAWN = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/SetTimePacket.php b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php
index bbda12491..b3cd6845a 100644
--- a/src/pocketmine/network/mcpe/protocol/SetTimePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetTimePacket extends DataPacket{
+class SetTimePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_TIME_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php b/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php
index c793dbb32..207a9f86a 100644
--- a/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SetTitlePacket extends DataPacket{
+class SetTitlePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SET_TITLE_PACKET;
 
 	public const TYPE_CLEAR_TITLE = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php
index d8b325480..b74e92ac2 100644
--- a/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ShowCreditsPacket extends DataPacket{
+class ShowCreditsPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SHOW_CREDITS_PACKET;
 
 	public const STATUS_START_CREDITS = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php b/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php
index afb00dcb9..b527e1c17 100644
--- a/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ShowProfilePacket extends DataPacket{
+class ShowProfilePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SHOW_PROFILE_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php b/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php
index 0cc39362c..2ba88fe2e 100644
--- a/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class ShowStoreOfferPacket extends DataPacket{
+class ShowStoreOfferPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SHOW_STORE_OFFER_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php b/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php
index 58d57c185..d801f0a4c 100644
--- a/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SimpleEventPacket extends DataPacket{
+class SimpleEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SIMPLE_EVENT_PACKET;
 
 	public const TYPE_ENABLE_COMMANDS = 1;
diff --git a/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php
index a727f066d..5a8983806 100644
--- a/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SpawnExperienceOrbPacket extends DataPacket{
+class SpawnExperienceOrbPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SPAWN_EXPERIENCE_ORB_PACKET;
 
 	/** @var Vector3 */
diff --git a/src/pocketmine/network/mcpe/protocol/SpawnParticleEffectPacket.php b/src/pocketmine/network/mcpe/protocol/SpawnParticleEffectPacket.php
index 01fe30753..e0af480e1 100644
--- a/src/pocketmine/network/mcpe/protocol/SpawnParticleEffectPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SpawnParticleEffectPacket.php
@@ -29,7 +29,7 @@ use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\protocol\types\DimensionIds;
 
-class SpawnParticleEffectPacket extends DataPacket{
+class SpawnParticleEffectPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SPAWN_PARTICLE_EFFECT_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php
index 433288e18..a3b57ccc3 100644
--- a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php
@@ -34,7 +34,7 @@ use function count;
 use function file_get_contents;
 use function json_decode;
 
-class StartGamePacket extends DataPacket{
+class StartGamePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::START_GAME_PACKET;
 
 	/** @var string|null */
diff --git a/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php b/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php
index 74cdbb221..117261386 100644
--- a/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class StopSoundPacket extends DataPacket{
+class StopSoundPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::STOP_SOUND_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php
index 4bbad7173..4af7f8c78 100644
--- a/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class StructureBlockUpdatePacket extends DataPacket{
+class StructureBlockUpdatePacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::STRUCTURE_BLOCK_UPDATE_PACKET;
 
 	protected function decodePayload() : void{
diff --git a/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php b/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php
index e29a96e77..834c40682 100644
--- a/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class SubClientLoginPacket extends DataPacket{
+class SubClientLoginPacket extends DataPacket implements ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::SUB_CLIENT_LOGIN_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php
index 64a267b96..05c14f4d3 100644
--- a/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class TakeItemEntityPacket extends DataPacket{
+class TakeItemEntityPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::TAKE_ITEM_ENTITY_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/TextPacket.php b/src/pocketmine/network/mcpe/protocol/TextPacket.php
index 2772be93c..207f1e388 100644
--- a/src/pocketmine/network/mcpe/protocol/TextPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/TextPacket.php
@@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function count;
 
-class TextPacket extends DataPacket{
+class TextPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
 	public const NETWORK_ID = ProtocolInfo::TEXT_PACKET;
 
 	public const TYPE_RAW = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/TransferPacket.php b/src/pocketmine/network/mcpe/protocol/TransferPacket.php
index 6e841ac0d..c32da8c9f 100644
--- a/src/pocketmine/network/mcpe/protocol/TransferPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/TransferPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class TransferPacket extends DataPacket{
+class TransferPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::TRANSFER_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php
index 64e4cf221..92ebc6b23 100644
--- a/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php
@@ -30,7 +30,7 @@ use pocketmine\entity\Attribute;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function array_values;
 
-class UpdateAttributesPacket extends DataPacket{
+class UpdateAttributesPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::UPDATE_ATTRIBUTES_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php
index 254f54bd0..62e13f711 100644
--- a/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class UpdateBlockPacket extends DataPacket{
+class UpdateBlockPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::UPDATE_BLOCK_PACKET;
 
 	public const DATA_LAYER_NORMAL = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php
index fc5ba6934..9cca5632c 100644
--- a/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class UpdateEquipPacket extends DataPacket{
+class UpdateEquipPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::UPDATE_EQUIP_PACKET;
 
 	/** @var int */
diff --git a/src/pocketmine/network/mcpe/protocol/UpdateSoftEnumPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateSoftEnumPacket.php
index f1ec04284..c1bee5e4e 100644
--- a/src/pocketmine/network/mcpe/protocol/UpdateSoftEnumPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/UpdateSoftEnumPacket.php
@@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use function count;
 
-class UpdateSoftEnumPacket extends DataPacket{
+class UpdateSoftEnumPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::UPDATE_SOFT_ENUM_PACKET;
 
 	public const TYPE_ADD = 0;
diff --git a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php
index 597689122..d78c9229e 100644
--- a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php
@@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\handler\SessionHandler;
 use pocketmine\network\mcpe\protocol\types\WindowTypes;
 
-class UpdateTradePacket extends DataPacket{
+class UpdateTradePacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::UPDATE_TRADE_PACKET;
 
 	//TODO: find fields
diff --git a/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php b/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php
index 8619b15c8..785501263 100644
--- a/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php
@@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\handler\SessionHandler;
 
-class WSConnectPacket extends DataPacket{
+class WSConnectPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::W_S_CONNECT_PACKET;
 
 	/** @var string */
diff --git a/src/pocketmine/timings/Timings.php b/src/pocketmine/timings/Timings.php
index 8a6185c4a..962215418 100644
--- a/src/pocketmine/timings/Timings.php
+++ b/src/pocketmine/timings/Timings.php
@@ -24,7 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\timings;
 
 use pocketmine\entity\Entity;
-use pocketmine\network\mcpe\protocol\Packet;
+use pocketmine\network\mcpe\protocol\ClientboundPacket;
+use pocketmine\network\mcpe\protocol\ServerboundPacket;
 use pocketmine\Player;
 use pocketmine\scheduler\TaskHandler;
 use pocketmine\tile\Tile;
@@ -212,11 +213,11 @@ abstract class Timings{
 	}
 
 	/**
-	 * @param Packet $pk
+	 * @param ServerboundPacket $pk
 	 *
 	 * @return TimingsHandler
 	 */
-	public static function getReceiveDataPacketTimings(Packet $pk) : TimingsHandler{
+	public static function getReceiveDataPacketTimings(ServerboundPacket $pk) : TimingsHandler{
 		$pid = $pk->pid();
 		if(!isset(self::$packetReceiveTimingMap[$pid])){
 			$pkName = (new \ReflectionClass($pk))->getShortName();
@@ -228,11 +229,11 @@ abstract class Timings{
 
 
 	/**
-	 * @param Packet $pk
+	 * @param ClientboundPacket $pk
 	 *
 	 * @return TimingsHandler
 	 */
-	public static function getSendDataPacketTimings(Packet $pk) : TimingsHandler{
+	public static function getSendDataPacketTimings(ClientboundPacket $pk) : TimingsHandler{
 		$pid = $pk->pid();
 		if(!isset(self::$packetSendTimingMap[$pid])){
 			$pkName = (new \ReflectionClass($pk))->getShortName();