mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 00:33:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix for crashes via item (MCPE-1198)

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-02-04 15:02:21 +01:00
parent 3578b90a39
commit f1c593d809
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/API/BlockAPI.php
View File

@ -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"]);

3
src/classes/material/Block.php
View File

@ -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),
);

4
src/classes/material/Item.php
View File

@ -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();
}

2
src/classes/material/block/attachable/Ladder.php
View File

@ -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,