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

Rename BlockIds -> BlockLegacyIds

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-03-23 19:46:31 +00:00
parent 79ef8e0803
commit 2a3e6dcf00
83 changed files with 541 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/block/Lava.php
View File

@ -67,16 +67,16 @@ class Lava extends Liquid{
if($colliding !== null){
if($this->decay === 0){
$this->liquidCollide($colliding, BlockFactory::get(BlockIds::OBSIDIAN));
$this->liquidCollide($colliding, BlockFactory::get(BlockLegacyIds::OBSIDIAN));
}elseif($this->decay <= 4){
$this->liquidCollide($colliding, BlockFactory::get(BlockIds::COBBLESTONE));
$this->liquidCollide($colliding, BlockFactory::get(BlockLegacyIds::COBBLESTONE));
}
}
}
protected function flowIntoBlock(Block $block, int $newFlowDecay, bool $falling) : void{
if($block instanceof Water){
$block->liquidCollide($this, BlockFactory::get(BlockIds::STONE));
$block->liquidCollide($this, BlockFactory::get(BlockLegacyIds::STONE));
}else{
parent::flowIntoBlock($block, $newFlowDecay, $falling);
}