diff --git a/src/API/BlockAPI.php b/src/API/BlockAPI.php index 346e4cf0..d493d9aa 100644 --- a/src/API/BlockAPI.php +++ b/src/API/BlockAPI.php @@ -414,21 +414,6 @@ class BlockAPI{ $data2["z"] = $next[2][2]; $this->server->handle("player.block.place", $data2); break; - case 65: //Ladder - if(isset(Material::$transparent[$target[0]])){ - return false; - } - $faces = array( - 2 => 2, - 3 => 3, - 4 => 4, - 5 => 5, - ); - if(!isset($faces[$data["face"]])){ - return false; - } - $data["meta"] = $faces[$data["face"]]; - break; case 59://Seeds case 105: $blockDown = $this->server->api->level->getBlock($data["x"], $data["y"] - 1, $data["z"]); diff --git a/src/classes/material/Block.php b/src/classes/material/Block.php index cff43558..35cf7cb4 100644 --- a/src/classes/material/Block.php +++ b/src/classes/material/Block.php @@ -177,6 +177,9 @@ abstract class Block{ } public function getDrops(Item $item, Player $player){ + if(!isset(Block::$class[$this->id])){ //Unknown blocks + return array(); + } return array( array($this->id, $this->meta, 1), ); diff --git a/src/classes/material/Item.php b/src/classes/material/Item.php index 7a5dd700..71148aba 100644 --- a/src/classes/material/Item.php +++ b/src/classes/material/Item.php @@ -32,7 +32,7 @@ class Item{ ); - protected $block = false; + protected $block; protected $id; protected $meta; protected $count; @@ -45,7 +45,7 @@ class Item{ $this->meta = (int) $meta; $this->count = (int) $count; $this->name = $name; - if(isset(Block::$class[$this->id])){ + if(!isset($this->block) and isset(Block::$class[$this->id])){ $this->block = BlockAPI::get($this->id, $this->meta); $this->name = $this->block->getName(); } diff --git a/src/classes/material/block/attachable/Ladder.php b/src/classes/material/block/attachable/Ladder.php index a89ce2f8..8d2dc3cb 100644 --- a/src/classes/material/block/attachable/Ladder.php +++ b/src/classes/material/block/attachable/Ladder.php @@ -31,7 +31,7 @@ class LadderBlock extends TransparentBlock{ } public function place(BlockAPI $level, Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ if($block->inWorld === true){ - if($block->isTransparent === false){ + if($target->isTransparent === false){ $faces = array( 2 => 2, 3 => 3,