diff --git a/src/CrashDump.php b/src/CrashDump.php
index 18ba417a4..77e193fff 100644
--- a/src/CrashDump.php
+++ b/src/CrashDump.php
@@ -82,8 +82,11 @@ class CrashDump{
 
 	/** @var Server */
 	private $server;
+	/** @var resource */
 	private $fp;
+	/** @var int */
 	private $time;
+	/** @var mixed[] */
 	private $data = [];
 	/** @var string */
 	private $encodedData = "";
diff --git a/src/command/CommandReader.php b/src/command/CommandReader.php
index ac4324979..0a9f7f3a6 100644
--- a/src/command/CommandReader.php
+++ b/src/command/CommandReader.php
@@ -55,7 +55,9 @@ class CommandReader extends Thread{
 
 	/** @var \Threaded */
 	protected $buffer;
+	/** @var bool */
 	private $shutdown = false;
+	/** @var int */
 	private $type = self::TYPE_STREAM;
 
 	/** @var SleeperNotifier|null */
diff --git a/src/command/FormattedCommandAlias.php b/src/command/FormattedCommandAlias.php
index 87655da02..d6daabed1 100644
--- a/src/command/FormattedCommandAlias.php
+++ b/src/command/FormattedCommandAlias.php
@@ -32,6 +32,7 @@ use function strpos;
 use function substr;
 
 class FormattedCommandAlias extends Command{
+	/** @var string[] */
 	private $formatStrings = [];
 
 	/**
diff --git a/src/crafting/MultiRecipe.php b/src/crafting/MultiRecipe.php
index a44edad1e..1cf8147ef 100644
--- a/src/crafting/MultiRecipe.php
+++ b/src/crafting/MultiRecipe.php
@@ -39,6 +39,7 @@ class MultiRecipe{
 	public const TYPE_FIREWORKS = "00000000-0000-0000-0000-000000000002";
 	public const TYPE_MAP_LOCKING_CARTOGRAPHY = "602234E4-CAC1-4353-8BB7-B1EBFF70024B";
 
+	/** @var UUID */
 	private $uuid;
 
 	public function __construct(UUID $uuid){
diff --git a/src/entity/Attribute.php b/src/entity/Attribute.php
index 7ce9af10b..8d3fd0c6c 100644
--- a/src/entity/Attribute.php
+++ b/src/entity/Attribute.php
@@ -47,13 +47,20 @@ class Attribute{
 	public const HORSE_JUMP_STRENGTH = self::MC_PREFIX . "horse.jump_strength";
 	public const ZOMBIE_SPAWN_REINFORCEMENTS = self::MC_PREFIX . "zombie.spawn_reinforcements";
 
+	/** @var string */
 	protected $id;
+	/** @var float */
 	protected $minValue;
+	/** @var float */
 	protected $maxValue;
+	/** @var float */
 	protected $defaultValue;
+	/** @var float */
 	protected $currentValue;
+	/** @var bool */
 	protected $shouldSend;
 
+	/** @var bool */
 	protected $desynchronized = true;
 
 	/** @var Attribute[] */
diff --git a/src/entity/Living.php b/src/entity/Living.php
index 5e796b247..afe021cd7 100644
--- a/src/entity/Living.php
+++ b/src/entity/Living.php
@@ -71,6 +71,7 @@ abstract class Living extends Entity{
 	protected $gravity = 0.08;
 	protected $drag = 0.02;
 
+	/** @var int */
 	protected $attackTime = 0;
 
 	/** @var int */
@@ -78,6 +79,7 @@ abstract class Living extends Entity{
 	/** @var int */
 	protected $maxDeadTicks = 25;
 
+	/** @var float */
 	protected $jumpVelocity = 0.42;
 
 	/** @var EffectManager */
diff --git a/src/entity/Squid.php b/src/entity/Squid.php
index 09cae8408..4b98c2401 100644
--- a/src/entity/Squid.php
+++ b/src/entity/Squid.php
@@ -43,8 +43,10 @@ class Squid extends WaterAnimal{
 
 	/** @var Vector3|null */
 	public $swimDirection = null;
+	/** @var float */
 	public $swimSpeed = 0.1;
 
+	/** @var int */
 	private $switchDirectionTicker = 0;
 
 	public function initEntity(CompoundTag $nbt) : void{
diff --git a/src/entity/object/PrimedTNT.php b/src/entity/object/PrimedTNT.php
index 09cc70861..084c7f489 100644
--- a/src/entity/object/PrimedTNT.php
+++ b/src/entity/object/PrimedTNT.php
@@ -46,6 +46,7 @@ class PrimedTNT extends Entity implements Explosive{
 	protected $gravity = 0.04;
 	protected $drag = 0.02;
 
+	/** @var int */
 	protected $fuse;
 
 	public $canCollide = false;
diff --git a/src/event/entity/EntityCombustEvent.php b/src/event/entity/EntityCombustEvent.php
index e205390c9..6bee08a8c 100644
--- a/src/event/entity/EntityCombustEvent.php
+++ b/src/event/entity/EntityCombustEvent.php
@@ -30,6 +30,7 @@ use pocketmine\event\CancellableTrait;
 class EntityCombustEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 
+	/** @var int */
 	protected $duration;
 
 	/**
diff --git a/src/event/player/PlayerDeathEvent.php b/src/event/player/PlayerDeathEvent.php
index b9653d27d..303591777 100644
--- a/src/event/player/PlayerDeathEvent.php
+++ b/src/event/player/PlayerDeathEvent.php
@@ -40,6 +40,7 @@ class PlayerDeathEvent extends EntityDeathEvent{
 
 	/** @var TextContainer|string */
 	private $deathMessage;
+	/** @var bool */
 	private $keepInventory = false;
 
 	/**
diff --git a/src/inventory/transaction/InventoryTransaction.php b/src/inventory/transaction/InventoryTransaction.php
index 881d936a7..31bb9dc9e 100644
--- a/src/inventory/transaction/InventoryTransaction.php
+++ b/src/inventory/transaction/InventoryTransaction.php
@@ -54,6 +54,7 @@ use function spl_object_id;
  * @see InventoryAction
  */
 class InventoryTransaction{
+	/** @var bool */
 	protected $hasExecuted = false;
 	/** @var Player */
 	protected $source;
diff --git a/src/network/mcpe/protocol/AddPlayerPacket.php b/src/network/mcpe/protocol/AddPlayerPacket.php
index cf3a3b809..df80e2422 100644
--- a/src/network/mcpe/protocol/AddPlayerPacket.php
+++ b/src/network/mcpe/protocol/AddPlayerPacket.php
@@ -62,12 +62,18 @@ class AddPlayerPacket extends DataPacket implements ClientboundPacket{
 	public $metadata = [];
 
 	//TODO: adventure settings stuff
+	/** @var int */
 	public $uvarint1 = 0;
+	/** @var int */
 	public $uvarint2 = 0;
+	/** @var int */
 	public $uvarint3 = 0;
+	/** @var int */
 	public $uvarint4 = 0;
+	/** @var int */
 	public $uvarint5 = 0;
 
+	/** @var int */
 	public $long1 = 0;
 
 	/** @var EntityLink[] */
diff --git a/src/network/mcpe/protocol/CraftingDataPacket.php b/src/network/mcpe/protocol/CraftingDataPacket.php
index e45b46825..0de48cd26 100644
--- a/src/network/mcpe/protocol/CraftingDataPacket.php
+++ b/src/network/mcpe/protocol/CraftingDataPacket.php
@@ -63,6 +63,7 @@ class CraftingDataPacket extends DataPacket implements ClientboundPacket{
 	/** @var bool */
 	public $cleanRecipes = false;
 
+	/** @var mixed[][] */
 	public $decodedEntries = [];
 
 	protected function decodePayload() : void{
diff --git a/src/permission/Permission.php b/src/permission/Permission.php
index 41090f5c9..adca9f5a1 100644
--- a/src/permission/Permission.php
+++ b/src/permission/Permission.php
@@ -36,6 +36,7 @@ class Permission{
 	public const DEFAULT_TRUE = "true";
 	public const DEFAULT_FALSE = "false";
 
+	/** @var string */
 	public static $DEFAULT_PERMISSION = self::DEFAULT_OP;
 
 	/** @var string */
diff --git a/src/scheduler/AsyncWorker.php b/src/scheduler/AsyncWorker.php
index 7de763da8..e817e2646 100644
--- a/src/scheduler/AsyncWorker.php
+++ b/src/scheduler/AsyncWorker.php
@@ -31,7 +31,9 @@ class AsyncWorker extends Worker{
 	/** @var mixed[] */
 	private static $store = [];
 
+	/** @var \ThreadedLogger */
 	private $logger;
+	/** @var int */
 	private $id;
 
 	/** @var int */
diff --git a/src/scheduler/BulkCurlTask.php b/src/scheduler/BulkCurlTask.php
index c0427fa7e..39666d7a0 100644
--- a/src/scheduler/BulkCurlTask.php
+++ b/src/scheduler/BulkCurlTask.php
@@ -34,6 +34,7 @@ use function unserialize;
  * The result of this AsyncTask is an array of arrays (returned from {@link Internet::simpleCurl}) or InternetException objects.
  */
 class BulkCurlTask extends AsyncTask{
+	/** @var string */
 	private $operations;
 
 	/**
diff --git a/src/scheduler/SendUsageTask.php b/src/scheduler/SendUsageTask.php
index 1d00766c5..d43b48b3f 100644
--- a/src/scheduler/SendUsageTask.php
+++ b/src/scheduler/SendUsageTask.php
@@ -47,7 +47,9 @@ class SendUsageTask extends AsyncTask{
 	public const TYPE_STATUS = 2;
 	public const TYPE_CLOSE = 3;
 
+	/** @var string */
 	public $endpoint;
+	/** @var string */
 	public $data;
 
 	/**
diff --git a/src/thread/CommonThreadPartsTrait.php b/src/thread/CommonThreadPartsTrait.php
index 14fe40d0f..0c5a84eac 100644
--- a/src/thread/CommonThreadPartsTrait.php
+++ b/src/thread/CommonThreadPartsTrait.php
@@ -32,6 +32,7 @@ trait CommonThreadPartsTrait{
 	/** @var string|null */
 	protected $composerAutoloaderPath;
 
+	/** @var bool */
 	protected $isKilled = false;
 
 	public function getClassLoader(){
diff --git a/src/utils/Config.php b/src/utils/Config.php
index a9c4eeb73..c383d216e 100644
--- a/src/utils/Config.php
+++ b/src/utils/Config.php
@@ -71,6 +71,7 @@ class Config{
 	/** @var array */
 	private $config = [];
 
+	/** @var mixed[] */
 	private $nestedCache = [];
 
 	/** @var string */
@@ -83,6 +84,7 @@ class Config{
 	/** @var bool */
 	private $changed = false;
 
+	/** @var int[] */
 	public static $formats = [
 		"properties" => Config::PROPERTIES,
 		"cnf" => Config::CNF,
diff --git a/src/utils/Internet.php b/src/utils/Internet.php
index 9d7f5777f..4eaf57638 100644
--- a/src/utils/Internet.php
+++ b/src/utils/Internet.php
@@ -62,7 +62,9 @@ use const SOCK_DGRAM;
 use const SOL_UDP;
 
 class Internet{
+	/** @var string|false */
 	public static $ip = false;
+	/** @var bool */
 	public static $online = true;
 
 	/**
diff --git a/src/utils/ServerKiller.php b/src/utils/ServerKiller.php
index 993c41d2b..b8f2550d2 100644
--- a/src/utils/ServerKiller.php
+++ b/src/utils/ServerKiller.php
@@ -29,6 +29,7 @@ use function time;
 
 class ServerKiller extends Thread{
 
+	/** @var int */
 	public $time;
 
 	/** @var bool */
diff --git a/src/utils/Terminal.php b/src/utils/Terminal.php
index eb3f35a69..51f854681 100644
--- a/src/utils/Terminal.php
+++ b/src/utils/Terminal.php
@@ -32,29 +32,51 @@ use function stream_isatty;
 use const PHP_EOL;
 
 abstract class Terminal{
+	/** @var string */
 	public static $FORMAT_BOLD = "";
+	/** @var string */
 	public static $FORMAT_OBFUSCATED = "";
+	/** @var string */
 	public static $FORMAT_ITALIC = "";
+	/** @var string */
 	public static $FORMAT_UNDERLINE = "";
+	/** @var string */
 	public static $FORMAT_STRIKETHROUGH = "";
 
+	/** @var string */
 	public static $FORMAT_RESET = "";
 
+	/** @var string */
 	public static $COLOR_BLACK = "";
+	/** @var string */
 	public static $COLOR_DARK_BLUE = "";
+	/** @var string */
 	public static $COLOR_DARK_GREEN = "";
+	/** @var string */
 	public static $COLOR_DARK_AQUA = "";
+	/** @var string */
 	public static $COLOR_DARK_RED = "";
+	/** @var string */
 	public static $COLOR_PURPLE = "";
+	/** @var string */
 	public static $COLOR_GOLD = "";
+	/** @var string */
 	public static $COLOR_GRAY = "";
+	/** @var string */
 	public static $COLOR_DARK_GRAY = "";
+	/** @var string */
 	public static $COLOR_BLUE = "";
+	/** @var string */
 	public static $COLOR_GREEN = "";
+	/** @var string */
 	public static $COLOR_AQUA = "";
+	/** @var string */
 	public static $COLOR_RED = "";
+	/** @var string */
 	public static $COLOR_LIGHT_PURPLE = "";
+	/** @var string */
 	public static $COLOR_YELLOW = "";
+	/** @var string */
 	public static $COLOR_WHITE = "";
 
 	/** @var bool|null */
diff --git a/src/utils/Utils.php b/src/utils/Utils.php
index fff19b535..c34a771f4 100644
--- a/src/utils/Utils.php
+++ b/src/utils/Utils.php
@@ -87,7 +87,7 @@ use const STR_PAD_RIGHT;
  * Big collection of functions
  */
 class Utils{
-	/** @var string */
+	/** @var string|null */
 	private static $os;
 	/** @var UUID|null */
 	private static $serverUniqueId = null;
diff --git a/src/world/World.php b/src/world/World.php
index de76cde1c..e578b56ad 100644
--- a/src/world/World.php
+++ b/src/world/World.php
@@ -108,6 +108,7 @@ use const PHP_INT_MIN;
 
 class World implements ChunkManager{
 
+	/** @var int */
 	private static $worldIdCounter = 1;
 
 	public const Y_MASK = 0xFF;
diff --git a/src/world/format/io/region/RegionLoader.php b/src/world/format/io/region/RegionLoader.php
index c782b2e6a..b8572f4b1 100644
--- a/src/world/format/io/region/RegionLoader.php
+++ b/src/world/format/io/region/RegionLoader.php
@@ -59,6 +59,7 @@ class RegionLoader{
 
 	private const FIRST_SECTOR = 2; //location table occupies 0 and 1
 
+	/** @var int */
 	public static $COMPRESSION_LEVEL = 7;
 
 	/** @var string */
diff --git a/src/world/generator/GeneratorRegisterTask.php b/src/world/generator/GeneratorRegisterTask.php
index 4904ca038..7b2376b5e 100644
--- a/src/world/generator/GeneratorRegisterTask.php
+++ b/src/world/generator/GeneratorRegisterTask.php
@@ -32,10 +32,15 @@ use function unserialize;
 
 class GeneratorRegisterTask extends AsyncTask{
 
+	/** @var string */
 	public $generatorClass;
+	/** @var string */
 	public $settings;
+	/** @var int */
 	public $seed;
+	/** @var int */
 	public $worldId;
+	/** @var int */
 	public $worldHeight = World::Y_MAX;
 
 	public function __construct(World $world, string $generatorClass, array $generatorSettings = []){
diff --git a/src/world/generator/GeneratorUnregisterTask.php b/src/world/generator/GeneratorUnregisterTask.php
index 4f7a5c7e0..5a4d91387 100644
--- a/src/world/generator/GeneratorUnregisterTask.php
+++ b/src/world/generator/GeneratorUnregisterTask.php
@@ -28,6 +28,7 @@ use pocketmine\world\World;
 
 class GeneratorUnregisterTask extends AsyncTask{
 
+	/** @var int */
 	public $worldId;
 
 	public function __construct(World $world){
diff --git a/src/world/generator/PopulationTask.php b/src/world/generator/PopulationTask.php
index 3fe2b94e6..e4314719f 100644
--- a/src/world/generator/PopulationTask.php
+++ b/src/world/generator/PopulationTask.php
@@ -32,18 +32,31 @@ use pocketmine\world\World;
 class PopulationTask extends AsyncTask{
 	private const TLS_KEY_WORLD = "world";
 
+	/** @var bool */
 	public $state;
+	/** @var int */
 	public $worldId;
+	/** @var string */
 	public $chunk;
 
+	/** @var string */
 	public $chunk0;
+	/** @var string */
 	public $chunk1;
+	/** @var string */
 	public $chunk2;
+	/** @var string */
 	public $chunk3;
+
 	//center chunk
+
+	/** @var string */
 	public $chunk5;
+	/** @var string */
 	public $chunk6;
+	/** @var string */
 	public $chunk7;
+	/** @var string */
 	public $chunk8;
 
 	public function __construct(World $world, Chunk $chunk){
diff --git a/src/world/generator/normal/Normal.php b/src/world/generator/normal/Normal.php
index 4fc7250fd..848597c0f 100644
--- a/src/world/generator/normal/Normal.php
+++ b/src/world/generator/normal/Normal.php
@@ -52,7 +52,9 @@ class Normal extends Generator{
 	/** @var BiomeSelector */
 	private $selector;
 
+	/** @var float[][]|null */
 	private static $GAUSSIAN_KERNEL = null;
+	/** @var int */
 	private static $SMOOTH_SIZE = 2;
 
 	/**
diff --git a/src/world/generator/populator/TallGrass.php b/src/world/generator/populator/TallGrass.php
index 8ec53bf15..ef534e55f 100644
--- a/src/world/generator/populator/TallGrass.php
+++ b/src/world/generator/populator/TallGrass.php
@@ -31,7 +31,9 @@ use pocketmine\world\ChunkManager;
 class TallGrass extends Populator{
 	/** @var ChunkManager */
 	private $world;
+	/** @var int */
 	private $randomAmount = 1;
+	/** @var int */
 	private $baseAmount = 0;
 
 	public function setRandomAmount(int $amount) : void{
diff --git a/src/world/generator/populator/Tree.php b/src/world/generator/populator/Tree.php
index 735123468..9c37757b4 100644
--- a/src/world/generator/populator/Tree.php
+++ b/src/world/generator/populator/Tree.php
@@ -32,7 +32,9 @@ use pocketmine\world\generator\object\Tree as ObjectTree;
 class Tree extends Populator{
 	/** @var ChunkManager */
 	private $world;
+	/** @var int */
 	private $randomAmount = 1;
+	/** @var int */
 	private $baseAmount = 0;
 
 	/** @var TreeType */
diff --git a/src/world/particle/FloatingTextParticle.php b/src/world/particle/FloatingTextParticle.php
index a3e306700..0f9ceb7dd 100644
--- a/src/world/particle/FloatingTextParticle.php
+++ b/src/world/particle/FloatingTextParticle.php
@@ -42,9 +42,13 @@ use function str_repeat;
 class FloatingTextParticle implements Particle{
 	//TODO: HACK!
 
+	/** @var string */
 	protected $text;
+	/** @var string */
 	protected $title;
-	protected $entityId;
+	/** @var int|null */
+	protected $entityId = null;
+	/** @var bool */
 	protected $invisible = false;
 
 	/**