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

Move block registration to its own class

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-20 18:05:01 +01:00
committed by GitHub
parent 9451dd361e
commit 02f42eba48
62 changed files with 560 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/block/WoodenSlab.php
View File

@ -86,11 +86,11 @@ class WoodenSlab extends Transparent{
$this->meta &= 0x07;
if($face === Vector3::SIDE_DOWN){
if($target->getId() === $this->id and ($target->getDamage() & 0x08) === 0x08 and ($target->getDamage() & 0x07) === $this->meta){
$this->getLevel()->setBlock($target, Block::get($this->doubleId, $this->meta), true);
$this->getLevel()->setBlock($target, BlockFactory::get($this->doubleId, $this->meta), true);
return true;
}elseif($block->getId() === $this->id and ($block->getDamage() & 0x07) === $this->meta){
$this->getLevel()->setBlock($block, Block::get($this->doubleId, $this->meta), true);
$this->getLevel()->setBlock($block, BlockFactory::get($this->doubleId, $this->meta), true);
return true;
}else{
@ -98,18 +98,18 @@ class WoodenSlab extends Transparent{
}
}elseif($face === Vector3::SIDE_UP){
if($target->getId() === $this->id and ($target->getDamage() & 0x08) === 0 and ($target->getDamage() & 0x07) === $this->meta){
$this->getLevel()->setBlock($target, Block::get($this->doubleId, $this->meta), true);
$this->getLevel()->setBlock($target, BlockFactory::get($this->doubleId, $this->meta), true);
return true;
}elseif($block->getId() === $this->id and ($block->getDamage() & 0x07) === $this->meta){
$this->getLevel()->setBlock($block, Block::get($this->doubleId, $this->meta), true);
$this->getLevel()->setBlock($block, BlockFactory::get($this->doubleId, $this->meta), true);
return true;
}
}else{ //TODO: collision
if($block->getId() === $this->id){
if(($block->getDamage() & 0x07) === $this->meta){
$this->getLevel()->setBlock($block, Block::get($this->doubleId, $this->meta), true);
$this->getLevel()->setBlock($block, BlockFactory::get($this->doubleId, $this->meta), true);
return true;
}