Merge commit '9cd6b3e1c7cd81d0a4b0da68d9b3ff026c9f6495'

src/command/Command.php

@@ -50,9 +50,7 @@ abstract class Command{
 	/** @var string[] */
 	private $aliases = [];
 
-	/**
+	/** @var string[] */
-	 * @var string[]
-	 */
 	private $activeAliases = [];
 
 	/** @var CommandMap|null */

src/command/SimpleCommandMap.php

@@ -78,9 +78,7 @@ use function trim;
 
 class SimpleCommandMap implements CommandMap{
 
-	/**
+	/** @var Command[] */
-	 * @var Command[]
-	 */
 	protected $knownCommands = [];
 
 	/** @var Server */

src/event/entity/EntityExplodeEvent.php

@@ -38,9 +38,7 @@ class EntityExplodeEvent extends EntityEvent implements Cancellable{
 	/** @var Position */
 	protected $position;
 
-	/**
+	/** @var Block[] */
-	 * @var Block[]
-	 */
 	protected $blocks;
 
 	/** @var float */

src/event/player/PlayerChatEvent.php

@@ -43,9 +43,7 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 	/** @var string */
 	protected $format;
 
-	/**
+	/** @var CommandSender[] */
-	 * @var CommandSender[]
-	 */
 	protected $recipients = [];
 
 	/**

src/permission/BanEntry.php

@@ -32,9 +32,7 @@ use function strtolower;
 use function trim;
 
 class BanEntry{
-	/**
+	/** @var string */
-	 * @var string
-	 */
 	public static $format = "Y-m-d H:i:s O";
 
 	/** @var string */

src/permission/PermissibleBase.php

@@ -35,14 +35,10 @@ class PermissibleBase implements Permissible{
 	/** @var Permissible */
 	private $parent = null;
 
-	/**
+	/** @var PermissionAttachment[] */
-	 * @var PermissionAttachment[]
-	 */
 	private $attachments = [];
 
-	/**
+	/** @var PermissionAttachmentInfo[] */
-	 * @var PermissionAttachmentInfo[]
-	 */
 	private $permissions = [];
 
 	public function __construct(ServerOperator $opable){

src/permission/Permission.php

@@ -45,9 +45,7 @@ class Permission{
 	/** @var string */
 	private $description;
 
-	/**
+	/** @var bool[] */
-	 * @var bool[]
-	 */
 	private $children;
 
 	/** @var string */

src/permission/PermissionAttachment.php

@@ -30,9 +30,7 @@ class PermissionAttachment{
 	/** @var PermissionRemovedExecutor */
 	private $removed = null;
 
-	/**
+	/** @var bool[] */
-	 * @var bool[]
-	 */
 	private $permissions = [];
 
 	/** @var Permissible */

src/plugin/PluginDescription.php

@@ -73,9 +73,7 @@ class PluginDescription{
 	/** @var PluginLoadOrder */
 	private $order;
 
-	/**
+	/** @var Permission[] */
-	 * @var Permission[]
-	 */
 	private $permissions = [];
 
 	/**

src/plugin/PluginManager.php

@@ -67,19 +67,13 @@ class PluginManager{
 	/** @var Server */
 	private $server;
 
-	/**
+	/** @var Plugin[] */
-	 * @var Plugin[]
-	 */
 	protected $plugins = [];
 
-	/**
+	/** @var Plugin[] */
-	 * @var Plugin[]
-	 */
 	protected $enabledPlugins = [];
 
-	/**
+	/** @var PluginLoader[] */
-	 * @var PluginLoader[]
-	 */
 	protected $fileAssociations = [];
 
 	/** @var string|null */

src/scheduler/TaskScheduler.php

@@ -36,14 +36,10 @@ class TaskScheduler{
 	/** @var bool */
 	private $enabled = true;
 
-	/**
+	/** @var ReversePriorityQueue<Task> */
-	 * @var ReversePriorityQueue<Task>
-	 */
 	protected $queue;
 
-	/**
+	/** @var TaskHandler[] */
-	 * @var TaskHandler[]
-	 */
 	protected $tasks = [];
 
 	/** @var int */

src/utils/Random.php

@@ -35,24 +35,16 @@ class Random{
 	public const Z = 521288629;
 	public const W = 88675123;
 
-	/**
+	/** @var int */
-	 * @var int
-	 */
 	private $x;
 
-	/**
+	/** @var int */
-	 * @var int
-	 */
 	private $y;
 
-	/**
+	/** @var int */
-	 * @var int
-	 */
 	private $z;
 
-	/**
+	/** @var int */
-	 * @var int
-	 */
 	private $w;
 
 	/** @var int */