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

Removed some copy-pasted code, fix leaves2 drops

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-02-21 13:03:23 +00:00
parent 3e141afe48
commit 21887b283f
4 changed files with 31 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/pocketmine/block/Slab.php
View File

@ -28,7 +28,7 @@ use pocketmine\item\Tool;
use pocketmine\math\AxisAlignedBB;
use pocketmine\Player;
class Slab extends Transparent{
class Slab extends WoodSlab{
const STONE = 0;
const SANDSTONE = 1;
const WOODEN = 2;
@ -40,6 +40,8 @@ class Slab extends Transparent{
protected $id = self::SLAB;
protected $doubleId = self::DOUBLE_SLAB;
public function __construct($meta = 0){
$this->meta = $meta;
}
@ -62,76 +64,8 @@ class Slab extends Transparent{
return (($this->meta & 0x08) > 0 ? "Upper " : "") . $names[$this->meta & 0x07] . " Slab";
}
protected function recalculateBoundingBox(){
if(($this->meta & 0x08) > 0){
return new AxisAlignedBB(
$this->x,
$this->y + 0.5,
$this->z,
$this->x + 1,
$this->y + 1,
$this->z + 1
);
}else{
return new AxisAlignedBB(
$this->x,
$this->y,
$this->z,
$this->x + 1,
$this->y + 0.5,
$this->z + 1
);
}
}
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$this->meta &= 0x07;
if($face === 0){
if($target->getId() === self::SLAB and ($target->getDamage() & 0x08) === 0x08 and ($target->getDamage() & 0x07) === ($this->meta & 0x07)){
$this->getLevel()->setBlock($target, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
return true;
}elseif($block->getId() === self::SLAB and ($block->getDamage() & 0x07) === ($this->meta & 0x07)){
$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
return true;
}else{
$this->meta |= 0x08;
}
}elseif($face === 1){
if($target->getId() === self::SLAB and ($target->getDamage() & 0x08) === 0 and ($target->getDamage() & 0x07) === ($this->meta & 0x07)){
$this->getLevel()->setBlock($target, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
return true;
}elseif($block->getId() === self::SLAB and ($block->getDamage() & 0x07) === ($this->meta & 0x07)){
$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
return true;
}
//TODO: check for collision
}else{
if($block->getId() === self::SLAB){
if(($block->getDamage() & 0x07) === ($this->meta & 0x07)){
$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
return true;
}
return false;
}else{
if($fy > 0.5){
$this->meta |= 0x08;
}
}
}
if($block->getId() === self::SLAB and ($target->getDamage() & 0x07) !== ($this->meta & 0x07)){
return false;
}
$this->getLevel()->setBlock($block, $this, true, true);
return true;
public function getToolType(){
return Tool::TYPE_PICKAXE;
}
public function getDrops(Item $item){
@ -143,9 +77,4 @@ class Slab extends Transparent{
return [];
}
}
public function getToolType(){
return Tool::TYPE_PICKAXE;
}
}