diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index cd46b5c1e..b202e0f05 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1706,6 +1706,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 
 		$pk = new StartGamePacket();
 		$pk->seed = -1;
+		$pk->dimension = 0;
 		$pk->x = $this->x;
 		$pk->y = $this->y;
 		$pk->z = $this->z;
diff --git a/src/pocketmine/inventory/PlayerInventory.php b/src/pocketmine/inventory/PlayerInventory.php
index db3cac450..e788421c6 100644
--- a/src/pocketmine/inventory/PlayerInventory.php
+++ b/src/pocketmine/inventory/PlayerInventory.php
@@ -383,10 +383,17 @@ class PlayerInventory extends BaseInventory{
 		}
 
 		$pk = new ContainerSetContentPacket();
-		$pk;
 		$pk->slots = [];
-		for($i = 0; $i < $this->getSize(); ++$i){ //Do not send armor by error here
-			$pk->slots[$i] = $this->getItem($i);
+		$holder = $this->getHolder();
+		if($holder instanceof Player and $holder->isCreative()){
+			//TODO: Remove this workaround because of broken client
+			foreach(Item::getCreativeItems() as $i => $item){
+				$pk->slots[$i] = Item::getCreativeItem($i);
+			}
+		}else{
+			for($i = 0; $i < $this->getSize(); ++$i){ //Do not send armor by error here
+				$pk->slots[$i] = $this->getItem($i);
+			}
 		}
 
 		foreach($target as $player){
@@ -416,7 +423,6 @@ class PlayerInventory extends BaseInventory{
 		}
 
 		$pk = new ContainerSetSlotPacket();
-		$pk;
 		$pk->slot = $index;
 		$pk->item = clone $this->getItem($index);