diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index 8d6d98c4b..b4c828546 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -68,6 +68,9 @@ return (new PhpCsFixer\Config)
 		],
 		'phpdoc_trim' => true,
 		'phpdoc_trim_consecutive_blank_line_separation' => true,
+		'return_type_declaration' => [
+			'space_before' => 'one'
+		],
 		'single_import_per_statement' => true,
 		'strict_param' => true,
 	])
diff --git a/src/block/BlockIdentifier.php b/src/block/BlockIdentifier.php
index 5ea45c90b..b69037ad0 100644
--- a/src/block/BlockIdentifier.php
+++ b/src/block/BlockIdentifier.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\tile\Tile;
+use pocketmine\utils\Utils;
 
 class BlockIdentifier{
 
@@ -40,6 +41,10 @@ class BlockIdentifier{
 		$this->blockId = $blockId;
 		$this->variant = $variant;
 		$this->itemId = $itemId;
+
+		if($tileClass !== null){
+			Utils::testValidInstance($tileClass, Tile::class);
+		}
 		$this->tileClass = $tileClass;
 	}
 
diff --git a/src/player/Player.php b/src/player/Player.php
index e7c5f7041..bdbec0bb3 100644
--- a/src/player/Player.php
+++ b/src/player/Player.php
@@ -1679,13 +1679,13 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		}
 
 		$entity->attack($ev);
+		$this->broadcastAnimation(new ArmSwingAnimation($this), $this->getViewers());
 
 		$soundPos = $entity->getPosition()->add(0, $entity->size->getHeight() / 2, 0);
 		if($ev->isCancelled()){
 			$this->getWorld()->addSound($soundPos, new EntityAttackNoDamageSound());
 			return false;
 		}
-		$this->broadcastAnimation(new ArmSwingAnimation($this), $this->getViewers());
 		$this->getWorld()->addSound($soundPos, new EntityAttackSound());
 
 		if($ev->getModifier(EntityDamageEvent::MODIFIER_CRITICAL) > 0 and $entity instanceof Living){