mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 18:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge changes from ALPHA11 for 1.2.13

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-04-04 11:31:39 +01:00
parent 99134de6b6 3a10df634b
commit 5b7b2dd0e2
28 changed files with 415 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/level/particle/DestroyBlockParticle.php
View File

@ -24,11 +24,12 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\math\Vector3;
class DestroyBlockParticle extends DestroyParticle{
public function __construct(Vector3 $pos, Block $b){
parent::__construct($pos, $b->getId() | ($b->getDamage() << 8));
parent::__construct($pos, BlockFactory::toStaticRuntimeId($b->getId(), $b->getDamage()));
}
}

3
src/pocketmine/level/particle/TerrainParticle.php
View File

@ -24,10 +24,11 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\math\Vector3;
class TerrainParticle extends GenericParticle{
public function __construct(Vector3 $pos, Block $b){
parent::__construct($pos, Particle::TYPE_TERRAIN, ($b->getDamage() << 8) | $b->getId());
parent::__construct($pos, Particle::TYPE_TERRAIN, BlockFactory::toStaticRuntimeId($b->getId(), $b->getDamage()));
}
}