1 files changed, 4 insertions, 21 deletions

diff --git a/src/Entities/ThrownEnderPearlEntity.cpp b/src/Entities/ThrownEnderPearlEntity.cpp
index 4dedffc5b..ca362d3bd 100644
--- a/src/Entities/ThrownEnderPearlEntity.cpp
+++ b/src/Entities/ThrownEnderPearlEntity.cpp
@@ -74,29 +74,12 @@ void cThrownEnderPearlEntity::TeleportCreator(Vector3d a_HitPos)
 		return;
 	}
 
-	class cProjectileCreatorCallbackForPlayers : public cPlayerListCallback
-	{
-	public:
-		cProjectileCreatorCallbackForPlayers(cEntity * a_Attacker, Vector3i a_CallbackHitPos) :
-			m_Attacker(a_Attacker),
-			m_HitPos(a_CallbackHitPos)
-		{
-		}
-
-		virtual bool Item(cPlayer * a_Entity) override
+	GetWorld()->FindAndDoWithPlayer(m_CreatorData.m_Name, [=](cPlayer & a_Entity)
 		{
 			// Teleport the creator here, make them take 5 damage:
-			a_Entity->TeleportToCoords(m_HitPos.x, m_HitPos.y + 0.2, m_HitPos.z);
-			a_Entity->TakeDamage(dtEnderPearl, m_Attacker, 5, 0);
+			a_Entity.TeleportToCoords(a_HitPos.x, a_HitPos.y + 0.2, a_HitPos.z);
+			a_Entity.TakeDamage(dtEnderPearl, this, 5, 0);
 			return true;
 		}
-
-	private:
-
-		cEntity * m_Attacker;
-		Vector3i m_HitPos;
-	};
-
-	cProjectileCreatorCallbackForPlayers PCCFP(this, a_HitPos);
-	GetWorld()->FindAndDoWithPlayer(m_CreatorData.m_Name, PCCFP);
+	);
 }