From 849cfcb01b9f4fbfd3b66c4d7a1a02edb73de7b1 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes Pueyo <shoghicp@gmail.com>
Date: Mon, 24 Dec 2012 14:43:19 +0100
Subject: [PATCH] Correct block drops, sapling/flower placing requirements

---
 TODO.md                  |  1 -
 classes/API/BlockAPI.php | 66 ++++++++++++++++++++++++++++++++++++++--
 classes/Data.class.php   |  9 ++++--
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/TODO.md b/TODO.md
index c91e8e825..2d767fbd4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -16,7 +16,6 @@ __Check Milestones [here](https://github.com/shoghicp/PocketMine-MP/issues/miles
 - Hoes tilling dirt
 - Players can often hear "echos" of their own block interactions' SFX (torch placed, block destroyed, etc. most noticeable when moving around as you place.)
 - Redstone ore blocks lighting up upon hit or contact
-- Sapling / flower placement requirements
 - Mushroom placement requirements
 - Reed placement requirements
 
diff --git a/classes/API/BlockAPI.php b/classes/API/BlockAPI.php
index e20feff02..35b951b9d 100644
--- a/classes/API/BlockAPI.php
+++ b/classes/API/BlockAPI.php
@@ -51,6 +51,61 @@ class BlockAPI{
 			1, //Count
 		);
 		switch($target[0]){
+			case 16:
+				$drop = array(263, 0, 1);
+				break;
+			case 21:
+				$drop = array(351, 4, mt_rand(4, 8));
+				break;
+			case 56:
+				$drop = array(264, 0, 1);
+				break;
+			case 73:
+			case 74:
+				$drop = array(351, 4, mt_rand(4, 5));
+				break;
+			case 18:
+				$drop = false;
+				if(mt_rand(1,20) === 1){ //Saplings
+					$drop = array(6, $target[1], 1);
+				}
+				if($target[1] === 0 and mt_rand(1,200) === 1){ //Apples
+					$this->drop($data["x"], $data["y"], $data["z"], 260, 0, 1);
+				}
+				break;
+			case 59:
+				if($target[1] >= 0x07){ //Seeds
+					$drop = array(296, 0, 1);
+					$this->drop($data["x"], $data["y"], $data["z"], 295, 0, mt_rand(0,3));
+				}else{
+					$drop = array(295, 0, 1);
+				}
+				break;
+			case 31:
+				$drop = false;
+				if(mt_rand(1,10) === 1){ //Seeds
+					$drop = array(295, 0, 1);
+				}
+				break;
+			case 20:
+				$drop = false;
+				break;
+			case 30:
+				$drop = false;
+				break;
+			case 51:
+				$drop = false;
+				break;
+			case 52:
+				$drop = false;
+				break;
+			case 43:
+				$drop = array(
+					44,
+					$target[1],
+					2,
+				);
+				break;
 			case 64: //Door
 				$drop = array(324, 0, 1);
 				if(($target[1] & 0x08) === 0x08){
@@ -70,7 +125,7 @@ class BlockAPI{
 				}
 				break;
 		}
-		if($drop !== false and $drop[0] !== 0 and $drop[2] > 0 and $this->server->gamemode !== 1){
+		if($drop !== false and $drop[0] !== 0 and $drop[2] > 0){
 			$this->drop($data["x"], $data["y"], $data["z"], $drop[0], $drop[1] & 0x0F, $drop[2] & 0xFF);
 		}
 		$this->server->trigger("player.block.break", $data);		
@@ -78,7 +133,7 @@ class BlockAPI{
 	}
 	
 	public function drop($x, $y, $z, $block, $meta, $stack = 1){
-		if($block === 0 or $stack <= 0){
+		if($block === 0 or $stack <= 0 or $this->server->gamemode === 1){
 			return;
 		}
 		$data = array(
@@ -175,6 +230,13 @@ class BlockAPI{
 		$direction = $this->server->api->entity->get($data["eid"])->getDirection();		
 		
 		switch($data["block"]){
+			case 6:
+			case 37:
+			case 38:
+				if($target[0] !== 2 and $target[0] !== 3){
+					return;
+				}
+				break;
 			case 50: //Torch
 				if(isset(Material::$transparent[$target[0]])){
 					return;
diff --git a/classes/Data.class.php b/classes/Data.class.php
index a192dc2a8..458b6547a 100644
--- a/classes/Data.class.php
+++ b/classes/Data.class.php
@@ -27,8 +27,12 @@ the Free Software Foundation, either version 3 of the License, or
 
 class Material{
 	static $unbreakable = array(
-		0,
-		7,	
+		0 => true,
+		7 => true,
+		8 => true,
+		9 => true,
+		10 => true,
+		11 => true,
 	);
 	static $transparent = array(
 		0 => true,
@@ -137,6 +141,7 @@ class Material{
 		50 => true,
 		53 => true,
 		54 => true,
+		56 => true,
 		59 => true,
 		57 => true,
 		58 => true,