Merge branch 'stable'

# Conflicts:
#	resources/vanilla
#	src/command/defaults/TeleportCommand.php
#	src/pocketmine/event/entity/EntityDespawnEvent.php
#	src/pocketmine/event/entity/EntityInventoryChangeEvent.php
#	src/pocketmine/event/entity/EntityLevelChangeEvent.php
#	src/pocketmine/event/entity/EntitySpawnEvent.php
#	tests/phpstan/configs/actual-problems.neon

src/event/entity/EntityBlockChangeEvent.php

@@ -30,6 +30,7 @@ use pocketmine\event\CancellableTrait;
 
 /**
  * Called when an Entity, excluding players, changes a block directly
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityBlockChangeEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;

src/event/entity/EntityCombustEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityCombustEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 

src/event/entity/EntityDamageEvent.php

@@ -31,6 +31,7 @@ use function max;
 
 /**
  * Called when an entity takes damage.
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityDamageEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;

src/event/entity/EntityDeathEvent.php

@@ -26,6 +26,9 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\Living;
 use pocketmine\item\Item;
 
+/**
+ * @phpstan-extends EntityEvent<Living>
+ */
 class EntityDeathEvent extends EntityEvent{
 	/** @var Item[] */
 	private $drops = [];

src/event/entity/EntityDespawnEvent.php

@@ -27,6 +27,7 @@ use pocketmine\entity\Entity;
 
 /**
  * Called when a entity is despawned
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityDespawnEvent extends EntityEvent{
 

src/event/entity/EntityEffectEvent.php

@@ -28,6 +28,9 @@ use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityEffectEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 

src/event/entity/EntityEvent.php

@@ -29,12 +29,19 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\Entity;
 use pocketmine\event\Event;
 
+/**
+ * @phpstan-template TEntity of Entity
+ */
 abstract class EntityEvent extends Event{
-	/** @var Entity */
+	/**
+	 * @var Entity
+	 * @phpstan-var TEntity
+	 */
 	protected $entity;
 
 	/**
 	 * @return Entity
+	 * @phpstan-return TEntity
 	 */
 	public function getEntity(){
 		return $this->entity;

src/event/entity/EntityExplodeEvent.php

@@ -31,6 +31,7 @@ use pocketmine\world\Position;
 
 /**
  * Called when a entity explodes
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityExplodeEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;

src/event/entity/EntityMotionEvent.php

@@ -28,6 +28,9 @@ use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 use pocketmine\math\Vector3;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityMotionEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 

src/event/entity/EntityRegainHealthEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityRegainHealthEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 

src/event/entity/EntityShootBowEvent.php

@@ -31,6 +31,9 @@ use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use function count;
 
+/**
+ * @phpstan-extends EntityEvent<Living>
+ */
 class EntityShootBowEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 

src/event/entity/EntitySpawnEvent.php

@@ -27,6 +27,7 @@ use pocketmine\entity\Entity;
 
 /**
  * Called when a entity is spawned
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntitySpawnEvent extends EntityEvent{
 

src/event/entity/EntityTeleportEvent.php

@@ -28,6 +28,9 @@ use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 use pocketmine\world\Position;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityTeleportEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 

src/event/entity/ExplosionPrimeEvent.php

@@ -29,6 +29,7 @@ use pocketmine\event\CancellableTrait;
 
 /**
  * Called when a entity decides to explode
+ * @phpstan-extends EntityEvent<Entity>
  */
 class ExplosionPrimeEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;

src/event/entity/ItemDespawnEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\object\ItemEntity;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 
+/**
+ * @phpstan-extends EntityEvent<ItemEntity>
+ */
 class ItemDespawnEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;
 

src/event/entity/ItemSpawnEvent.php

@@ -25,6 +25,9 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\object\ItemEntity;
 
+/**
+ * @phpstan-extends EntityEvent<ItemEntity>
+ */
 class ItemSpawnEvent extends EntityEvent{
 
 	public function __construct(ItemEntity $item){

src/event/entity/ProjectileHitEvent.php

@@ -28,6 +28,7 @@ use pocketmine\math\RayTraceResult;
 
 /**
  * @allowHandle
+ * @phpstan-extends EntityEvent<Projectile>
  */
 abstract class ProjectileHitEvent extends EntityEvent{
 	/** @var RayTraceResult */

src/event/entity/ProjectileLaunchEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 
+/**
+ * @phpstan-extends EntityEvent<Projectile>
+ */
 class ProjectileLaunchEvent extends EntityEvent implements Cancellable{
 	use CancellableTrait;