mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 00:33:59 +00:00
Code Issues Projects Releases Wiki Activity

Implement FallingBlock missing sounds (#5348)

Browse Source
This commit is contained in:
IvanCraft623 2022-12-18 14:33:50 -05:00 committed by GitHub
parent 3d75094874
commit 1785cbb6b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/block/Anvil.php
View File

@ -37,6 +37,8 @@ use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\player\Player;
use pocketmine\world\BlockTransaction;
use pocketmine\world\sound\AnvilFallSound;
use pocketmine\world\sound\Sound;
use function lcg_value;
use function round;
@ -109,4 +111,8 @@ class Anvil extends Transparent implements Fallable{
}
return true;
}
public function getLandSound() : ?Sound{
return new AnvilFallSound();
}
}

6
src/block/utils/Fallable.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\block\utils;
use pocketmine\block\Block;
use pocketmine\entity\object\FallingBlock;
use pocketmine\world\sound\Sound;
interface Fallable{
@ -40,4 +41,9 @@ interface Fallable{
* Returns whether the block should be placed.
*/
public function onHitGround(FallingBlock $blockEntity) : bool;
/**
* Returns the sound that will be played when FallingBlock hits the ground.
*/
public function getLandSound() : ?Sound;
}

5
src/block/utils/FallableTrait.php
View File

@ -30,6 +30,7 @@ use pocketmine\entity\object\FallingBlock;
use pocketmine\math\Facing;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\world\Position;
use pocketmine\world\sound\Sound;
/**
* This trait handles falling behaviour for blocks that need them.
@ -62,4 +63,8 @@ trait FallableTrait{
public function onHitGround(FallingBlock $blockEntity) : bool{
return true;
}
public function getLandSound() : ?Sound{
return null;
}
}

11
src/entity/object/FallingBlock.php
View File

@ -42,6 +42,7 @@ use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection;
use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties;
use pocketmine\world\format\io\GlobalBlockStateHandlers;
use pocketmine\world\sound\BlockBreakSound;
use function abs;
class FallingBlock extends Entity{
@ -128,14 +129,20 @@ class FallingBlock extends Entity{
if($this->onGround || $blockTarget !== null){
$this->flagForDespawn();
$blockResult = $blockTarget ?? $this->block;
$block = $world->getBlock($pos);
if(!$block->canBeReplaced() || !$world->isInWorld($pos->getFloorX(), $pos->getFloorY(), $pos->getFloorZ()) || ($this->onGround && abs($this->location->y - $this->location->getFloorY()) > 0.001)){
$world->dropItem($this->location, $this->block->asItem());
$world->addSound($pos->add(0.5, 0.5, 0.5), new BlockBreakSound($blockResult));
}else{
$ev = new EntityBlockChangeEvent($this, $block, $blockTarget ?? $this->block);
$ev = new EntityBlockChangeEvent($this, $block, $blockResult);
$ev->call();
if(!$ev->isCancelled()){
$world->setBlock($pos, $ev->getTo());
$b = $ev->getTo();
$world->setBlock($pos, $b);
if($this->onGround && $b instanceof Fallable && ($sound = $b->getLandSound()) !== null){
$world->addSound($pos->add(0.5, 0.5, 0.5), $sound);
}
}
}
$hasUpdate = true;