2 files changed, 8 insertions, 1 deletions

diff --git a/source/BlockID.h b/source/BlockID.h
index de8335e85..b7e9f3779 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -659,6 +659,7 @@ enum eDamageType
 	dtFireContact,      // Standing inside a fire block
 	dtInVoid,           // Falling into the Void (Y < 0)
 	dtPotionOfHarming,
+	dtEnderPearl,       // Thrown an ender pearl, teleported by it
 	dtAdmin,            // Damage applied by an admin command
 	
 	// Some common synonyms:
diff --git a/source/Entities/ProjectileEntity.cpp b/source/Entities/ProjectileEntity.cpp
index 91b2c97a8..8f9f3b480 100644
--- a/source/Entities/ProjectileEntity.cpp
+++ b/source/Entities/ProjectileEntity.cpp
@@ -316,7 +316,13 @@ cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X
 
 void cThrownEnderPearlEntity::OnHitSolidBlock(int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace)
 {
-	// TODO: Teleport the creator here, make them take 5 damage
+	// Teleport the creator here, make them take 5 damage:
+	if (m_Creator != NULL)
+	{
+		// TODO: The coords might need some tweaking based on the block face
+		m_Creator->TeleportToCoords(a_BlockX + 0.5, a_BlockY + 1.7, a_BlockZ + 0.5);
+		m_Creator->TakeDamage(dtEnderPearl, this, 5, 0);
+	}
 	
 	Destroy();
 }