mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 20:28:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-12-14 22:54:39 +00:00
commit 4b06fe73f2
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.php-cs-fixer.php
View File

@ -68,6 +68,9 @@ return (new PhpCsFixer\Config)
], ],
'phpdoc_trim' => true, 'phpdoc_trim' => true,
'phpdoc_trim_consecutive_blank_line_separation' => true, 'phpdoc_trim_consecutive_blank_line_separation' => true,
'return_type_declaration' => [
'space_before' => 'one'
],
'single_import_per_statement' => true, 'single_import_per_statement' => true,
'strict_param' => true, 'strict_param' => true,
]) ])

5
src/block/BlockIdentifier.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\tile\Tile; use pocketmine\block\tile\Tile;
use pocketmine\utils\Utils;
class BlockIdentifier{ class BlockIdentifier{
@ -40,6 +41,10 @@ class BlockIdentifier{
$this->blockId = $blockId; $this->blockId = $blockId;
$this->variant = $variant; $this->variant = $variant;
$this->itemId = $itemId; $this->itemId = $itemId;
if($tileClass !== null){
Utils::testValidInstance($tileClass, Tile::class);
}
$this->tileClass = $tileClass; $this->tileClass = $tileClass;
} }

2
src/player/Player.php
View File

@ -1679,13 +1679,13 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
$entity->attack($ev); $entity->attack($ev);
$this->broadcastAnimation(new ArmSwingAnimation($this), $this->getViewers());
$soundPos = $entity->getPosition()->add(0, $entity->size->getHeight() / 2, 0); $soundPos = $entity->getPosition()->add(0, $entity->size->getHeight() / 2, 0);
if($ev->isCancelled()){ if($ev->isCancelled()){
$this->getWorld()->addSound($soundPos, new EntityAttackNoDamageSound()); $this->getWorld()->addSound($soundPos, new EntityAttackNoDamageSound());
return false; return false;
} }
$this->broadcastAnimation(new ArmSwingAnimation($this), $this->getViewers());
$this->getWorld()->addSound($soundPos, new EntityAttackSound()); $this->getWorld()->addSound($soundPos, new EntityAttackSound());
if($ev->getModifier(EntityDamageEvent::MODIFIER_CRITICAL) > 0 and $entity instanceof Living){ if($ev->getModifier(EntityDamageEvent::MODIFIER_CRITICAL) > 0 and $entity instanceof Living){