mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +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

2
src/pocketmine/entity/object/FallingBlock.php
View File

@ -72,7 +72,7 @@ class FallingBlock extends Entity{
$this->block = BlockFactory::get($blockId, $damage);
$this->propertyManager->setInt(self::DATA_VARIANT, $this->block->getId() | ($this->block->getDamage() << 8));
$this->propertyManager->setInt(self::DATA_VARIANT, BlockFactory::toStaticRuntimeId($this->block->getId(), $this->block->getDamage()));
}
public function canCollideWith(Entity $entity) : bool{