From a8c997d88abb80b17f8238acadeb1a403a8e5493 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Mon, 3 Nov 2014 12:54:46 +0100
Subject: [PATCH] =?UTF-8?q?=C2=AC=C2=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pocketmine/inventory/BaseInventory.php   | 3 +--
 src/pocketmine/inventory/PlayerInventory.php | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pocketmine/inventory/BaseInventory.php b/src/pocketmine/inventory/BaseInventory.php
index 79ed94e8f..8ff41e7f8 100644
--- a/src/pocketmine/inventory/BaseInventory.php
+++ b/src/pocketmine/inventory/BaseInventory.php
@@ -125,8 +125,7 @@ abstract class BaseInventory implements Inventory{
 		if($index < 0 or $index >= $this->size){
 			return false;
 		}elseif($item->getID() === 0 or $item->getCount() <= 0){
-			$this->clear($index, $source);
-			return true;
+			return $this->clear($index, $source);
 		}
 
 		$holder = $this->getHolder();
diff --git a/src/pocketmine/inventory/PlayerInventory.php b/src/pocketmine/inventory/PlayerInventory.php
index 6f0d0805d..491ca03fd 100644
--- a/src/pocketmine/inventory/PlayerInventory.php
+++ b/src/pocketmine/inventory/PlayerInventory.php
@@ -446,8 +446,7 @@ class PlayerInventory extends BaseInventory{
 		foreach($target as $player){
 			if($player === $this->getHolder()){
 				/** @var Player $player */
-				$pk->windowid = 0;
-				$player->dataPacket(clone $pk);
+				$this->sendContents($player); //#blamemojang
 			}else{
 				if(($id = $player->getWindowId($this)) === -1){
 					$this->close($player);