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 commit 'a2543ff80d2906bccda1a4e2fdbd9d8e7d147fb3'

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-04-18 17:33:05 +01:00
parent 49a71ff4f8 a2543ff80d
commit 86e051b7bf
76 changed files with 286 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/block/Ice.php
View File

@ -43,7 +43,7 @@ class Ice extends Transparent{
public function onBreak(Item $item, ?Player $player = null) : bool{
if(($player === null or $player->isSurvival()) and !$item->hasEnchantment(Enchantment::SILK_TOUCH())){
$this->pos->getWorld()->setBlock($this->pos, VanillaBlocks::WATER());
$this->pos->getWorldNonNull()->setBlock($this->pos, VanillaBlocks::WATER());
return true;
}
return parent::onBreak($item, $player);
@ -54,8 +54,8 @@ class Ice extends Transparent{
}
public function onRandomTick() : void{
if($this->pos->getWorld()->getHighestAdjacentBlockLight($this->pos->x, $this->pos->y, $this->pos->z) >= 12){
$this->pos->getWorld()->useBreakOn($this->pos);
if($this->pos->getWorldNonNull()->getHighestAdjacentBlockLight($this->pos->x, $this->pos->y, $this->pos->z) >= 12){
$this->pos->getWorldNonNull()->useBreakOn($this->pos);
}
}