From f9d5c5bd3762d3313240fe136e8ba728b481c003 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Tue, 16 Sep 2014 17:49:44 +0200
Subject: [PATCH] Improved event checking on PlayerInteractEvent

---
 src/pocketmine/level/Level.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 2cd061dbe..6f5cbb777 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -1099,13 +1099,13 @@ class Level implements ChunkManager, Metadatable{
 				if($target->isActivable === true and $target->onActivate($item, $player) === true){
 					return true;
 				}
-			}
 
-			if($item->isActivable and $item->onActivate($this, $player, $block, $target, $face, $fx, $fy, $fz)){
-				if($item->getCount() <= 0){
-					$item = Item::get(Item::AIR, 0, 0);
+				if($item->isActivable and $item->onActivate($this, $player, $block, $target, $face, $fx, $fy, $fz)){
+					if($item->getCount() <= 0){
+						$item = Item::get(Item::AIR, 0, 0);
 
-					return true;
+						return true;
+					}
 				}
 			}
 		}elseif($target->isActivable === true and $target->onActivate($item, $player) === true){