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

Remove hardcoded facing literals in for loops

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-09-13 19:34:27 +01:00
parent 65684eec99
commit f488e594f6
9 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/block/Cactus.php
View File

@ -69,7 +69,7 @@ class Cactus extends Transparent{
if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
$this->getLevel()->useBreakOn($this);
}else{
for($side = 2; $side <= 5; ++$side){
foreach(Facing::HORIZONTAL as $side){
$b = $this->getSide($side);
if($b->isSolid()){
$this->getLevel()->useBreakOn($this);
@ -107,13 +107,13 @@ class Cactus extends Transparent{
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
$down = $this->getSide(Facing::DOWN);
if($down->getId() === self::SAND or $down->getId() === self::CACTUS){
$block0 = $this->getSide(Facing::NORTH);
$block1 = $this->getSide(Facing::SOUTH);
$block2 = $this->getSide(Facing::WEST);
$block3 = $this->getSide(Facing::EAST);
if(!$block0->isSolid() and !$block1->isSolid() and !$block2->isSolid() and !$block3->isSolid()){
return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
foreach(Facing::HORIZONTAL as $side){
if($this->getSide($side)->isSolid()){
return false;
}
}
return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
}
return false;