diff --git a/src/API/BlockAPI.php b/src/API/BlockAPI.php
index de352bfa6f..646963b37d 100644
--- a/src/API/BlockAPI.php
+++ b/src/API/BlockAPI.php
@@ -651,6 +651,15 @@ class BlockAPI{
 				$this->server->api->level->setBlock($spread[2][0], $spread[2][1], $spread[2][2], $spread[0], $level | $down, false);
 				return true;
 			}
+		}elseif($spread[0] === 9 or $spread[0] === 8){
+			if($source[0] === 11){
+				$this->server->api->level->setBlock($source[2][0], $source[2][1], $source[2][2], 49, 0);
+			}elseif($face === 0){
+				$this->server->api->level->setBlock($source[2][0], $source[2][1], $source[2][2], 1, 0);
+			}else{
+				$this->server->api->level->setBlock($source[2][0], $source[2][1], $source[2][2], 4, 0);
+			}
+			return true;
 		}elseif(isset(Material::$flowable[$spread[0]])){
 			$this->server->schedule(20, array($this, "blockScheduler"), array(
 				"x" => $spread[2][0],
@@ -690,6 +699,14 @@ class BlockAPI{
 				$this->server->api->level->setBlock($spread[2][0], $spread[2][1], $spread[2][2], $spread[0], $level | $down, false);
 				return true;
 			}
+		}elseif($spread[0] === 11){
+			$this->server->api->level->setBlock($spread[2][0], $spread[2][1], $spread[2][2], 49, 0, true);
+			return true;
+		}elseif($spread[0] === 10){
+			if($face === 0){
+				$this->server->api->level->setBlock($spread[2][0], $spread[2][1], $spread[2][2], 4, 0, true);
+				return true;
+			}
 		}elseif(isset(Material::$flowable[$spread[0]])){
 			$this->server->schedule(10, array($this, "blockScheduler"), array(
 				"x" => $spread[2][0],
diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php
index 9e13d1afe0..5a3ef17ddd 100644
--- a/src/API/PlayerAPI.php
+++ b/src/API/PlayerAPI.php
@@ -225,8 +225,10 @@ class PlayerAPI{
 			$player->close();
 			$this->saveOffline($player->username, $player->data);
 			$this->server->query("DELETE FROM players WHERE name = '".$player->username."';");
-			$player->entity->player = null;
-			$player->entity = null;
+			if($player->entity instanceof Entity){
+				$player->entity->player = null;
+				$player->entity = null;
+			}
 			$this->server->api->entity->remove($player->eid);
 			$player = null;
 			unset($player);