diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 889f17cc2b..85b668ddc6 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -2342,12 +2342,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 
 
 				break;
-			case ProtocolInfo::SEND_INVENTORY_PACKET: //TODO, Mojang, enable this ´^_^`
-				if($this->spawned === false){
-					break;
-				}
-				break;
-			case ProtocolInfo::ENTITY_DATA_PACKET:
+			case ProtocolInfo::TILE_ENTITY_DATA_PACKET:
 				if($this->spawned === false or $this->blocked === true or $this->dead === true){
 					break;
 				}
diff --git a/src/pocketmine/network/RakLibInterface.php b/src/pocketmine/network/RakLibInterface.php
index a9384f470c..55b4062493 100644
--- a/src/pocketmine/network/RakLibInterface.php
+++ b/src/pocketmine/network/RakLibInterface.php
@@ -40,7 +40,7 @@ use pocketmine\network\protocol\ContainerSetDataPacket;
 use pocketmine\network\protocol\ContainerSetSlotPacket;
 use pocketmine\network\protocol\DataPacket;
 use pocketmine\network\protocol\DropItemPacket;
-use pocketmine\network\protocol\EntityDataPacket;
+use pocketmine\network\protocol\TileEntityDataPacket;
 use pocketmine\network\protocol\EntityEventPacket;
 use pocketmine\network\protocol\ExplodePacket;
 use pocketmine\network\protocol\HurtArmorPacket;
@@ -348,7 +348,7 @@ class RakLibInterface implements ServerInstance, SourceInterface{
 		$this->registerPacket(ProtocolInfo::CONTAINER_SET_CONTENT_PACKET, ContainerSetContentPacket::class);
 		$this->registerPacket(ProtocolInfo::CHAT_PACKET, ChatPacket::class);
 		$this->registerPacket(ProtocolInfo::ADVENTURE_SETTINGS_PACKET, AdventureSettingsPacket::class);
-		$this->registerPacket(ProtocolInfo::ENTITY_DATA_PACKET, EntityDataPacket::class);
+		$this->registerPacket(ProtocolInfo::TILE_ENTITY_DATA_PACKET, TileEntityDataPacket::class);
 		$this->registerPacket(ProtocolInfo::SET_DIFFICULTY_PACKET, SetDifficultyPacket::class);
 	}
 
diff --git a/src/pocketmine/network/protocol/Info.php b/src/pocketmine/network/protocol/Info.php
index 5b69738358..9b4a938fb4 100644
--- a/src/pocketmine/network/protocol/Info.php
+++ b/src/pocketmine/network/protocol/Info.php
@@ -89,7 +89,7 @@ interface Info{
 	//const CONTAINER_ACK_PACKET = 0xad;
 	const CHAT_PACKET = 0xae;
 	const ADVENTURE_SETTINGS_PACKET = 0xaf;
-	const ENTITY_DATA_PACKET = 0xb0;
+	const TILE_ENTITY_DATA_PACKET = 0xb0;
 	//const PLAYER_INPUT_PACKET = 0xb1;
 	const FULL_CHUNK_DATA_PACKET = 0xb2;
 	const SET_DIFFICULTY_PACKET = 0xb3;
diff --git a/src/pocketmine/network/protocol/EntityDataPacket.php b/src/pocketmine/network/protocol/TileEntityDataPacket.php
similarity index 93%
rename from src/pocketmine/network/protocol/EntityDataPacket.php
rename to src/pocketmine/network/protocol/TileEntityDataPacket.php
index 3b0063821c..e8f4bd888a 100644
--- a/src/pocketmine/network/protocol/EntityDataPacket.php
+++ b/src/pocketmine/network/protocol/TileEntityDataPacket.php
@@ -24,7 +24,7 @@ namespace pocketmine\network\protocol;
 #include <rules/DataPacket.h>
 
 
-class EntityDataPacket extends DataPacket{
+class TileEntityDataPacket extends DataPacket{
 	public static $pool = [];
 	public static $next = 0;
 
@@ -34,7 +34,7 @@ class EntityDataPacket extends DataPacket{
 	public $namedtag;
 
 	public function pid(){
-		return Info::ENTITY_DATA_PACKET;
+		return Info::TILE_ENTITY_DATA_PACKET;
 	}
 
 	public function decode(){
@@ -52,4 +52,4 @@ class EntityDataPacket extends DataPacket{
 		$this->put($this->namedtag);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/pocketmine/tile/Spawnable.php b/src/pocketmine/tile/Spawnable.php
index 794e1d1539..c7fb287cf6 100644
--- a/src/pocketmine/tile/Spawnable.php
+++ b/src/pocketmine/tile/Spawnable.php
@@ -24,7 +24,7 @@ namespace pocketmine\tile;
 use pocketmine\level\format\FullChunk;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
-use pocketmine\network\protocol\EntityDataPacket;
+use pocketmine\network\protocol\TileEntityDataPacket;
 use pocketmine\Player;
 
 abstract class Spawnable extends Tile{
@@ -36,7 +36,7 @@ abstract class Spawnable extends Tile{
 
 		$nbt = new NBT(NBT::LITTLE_ENDIAN);
 		$nbt->setData($this->getSpawnCompound());
-		$pk = new EntityDataPacket();
+		$pk = new TileEntityDataPacket();
 		$pk->x = $this->x;
 		$pk->y = $this->y;
 		$pk->z = $this->z;
@@ -64,4 +64,4 @@ abstract class Spawnable extends Tile{
 			}
 		}
 	}
-}
\ No newline at end of file
+}