From b79374c13d4ce6dd9572bd66ac9bd86f50968bad Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Tue, 25 Dec 2012 18:05:15 +0100 Subject: [PATCH] Correct sapbling, mushroom and reed placing --- TODO.md | 3 +-- classes/API/BlockAPI.php | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index 965674f9..3b0fca31 100644 --- a/TODO.md +++ b/TODO.md @@ -16,9 +16,8 @@ __Check Milestones [here](https://github.com/shoghicp/PocketMine-MP/issues/miles - Water/lava spread - Fix spawn position resetting - Correct block placement for beds +- Correct chest/furnace placement - Players can often hear "echos" of their own block interactions' SFX (torch placed, block destroyed, etc. most noticeable when moving around as you place.) -- Mushroom placement requirements -- Reed placement requirements ## Beta (Survival) - Mob spawning, item pick up diff --git a/classes/API/BlockAPI.php b/classes/API/BlockAPI.php index 71e9b460..2364c3d6 100644 --- a/classes/API/BlockAPI.php +++ b/classes/API/BlockAPI.php @@ -309,12 +309,37 @@ class BlockAPI{ switch($data["block"]){ case 6: + if($target[0] === 60){ + break; + } case 37: case 38: if($target[0] !== 2 and $target[0] !== 3){ return; } break; + case 39://Mushrooms + case 40: + $blockDown = $this->server->api->level->getBlock($data["x"], $data["y"] - 1, $data["z"]); + if(isset(Material::$transparent[$blockDown[0]])){ + return; + } + break; + case 83: //Sugarcane + $blockDown = $this->server->api->level->getBlock($data["x"], $data["y"] - 1, $data["z"]); + if($blockDown[0] !== 2 and $blockDown[0] !== 3 and $blockDown[0] !== 12){ + return; + } + $block0 = $this->server->api->level->getBlock($data["x"], $data["y"], $data["z"] + 1); + $block1 = $this->server->api->level->getBlock($data["x"], $data["y"], $data["z"] - 1); + $block2 = $this->server->api->level->getBlock($data["x"] + 1, $data["y"], $data["z"]); + $block3 = $this->server->api->level->getBlock($data["x"] - 1, $data["y"], $data["z"]); + if($block0[0] === 9 or $block0[0] === 8 or $block1[0] === 9 or $block1[0] === 8 or $block2[0] === 9 or $block2[0] === 8 or $block3[0] === 9 or $block3[0] === 8){ + + }else{ + return; + } + break; case 50: //Torch if(isset(Material::$transparent[$target[0]])){ return;