1 files changed, 4 insertions, 63 deletions
diff --git a/src/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp
index 5cfe0d4cd..3d874e4d6 100644
--- a/src/Mobs/Enderman.cpp
+++ b/src/Mobs/Enderman.cpp
@@ -74,11 +74,13 @@ protected:
 
 
 cEnderman::cEnderman(void) :
-	super("Enderman", mtEnderman, "entity.endermen.hurt", "entity.endermen.death", 0.5, 2.9),
+	super(mtEnderman, "entity.endermen.hurt", "entity.endermen.death", 0.5, 2.9),
 	m_bIsScreaming(false),
 	CarriedBlock(E_BLOCK_AIR),
 	CarriedMeta(0)
 {
+	m_EMPersonality = PASSIVE;
+	GetMonsterConfig("Enderman");
 }
 
 
@@ -98,67 +100,6 @@ void cEnderman::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
-void cEnderman::CheckEventSeePlayer(cChunk & a_Chunk)
-{
-	if (GetTarget() != nullptr)
-	{
-		return;
-	}
-
-	cPlayerLookCheck Callback(GetPosition(), m_SightDistance);
-	if (m_World->ForEachPlayer(Callback))
-	{
-		return;
-	}
-
-	ASSERT(Callback.GetPlayer() != nullptr);
-
-	if (!CheckLight())
-	{
-		// Insufficient light for enderman to become aggravated
-		// TODO: Teleport to a suitable location
-		return;
-	}
-
-	if (!Callback.GetPlayer()->CanMobsTarget())
-	{
-		return;
-	}
-
-	// Target the player
-	cMonster::EventSeePlayer(Callback.GetPlayer(), a_Chunk);
-	m_EMState = CHASING;
-	m_bIsScreaming = true;
-	GetWorld()->BroadcastEntityMetadata(*this);
-}
-
-
-
-
-
-void cEnderman::CheckEventLostPlayer(void)
-{
-	super::CheckEventLostPlayer();
-	if (!CheckLight())
-	{
-		EventLosePlayer();
-	}
-}
-
-
-
-
-
-void cEnderman::EventLosePlayer()
-{
-	super::EventLosePlayer();
-	m_bIsScreaming = false;
-	GetWorld()->BroadcastEntityMetadata(*this);
-}
-
-
-
-
 
 bool cEnderman::CheckLight()
 {
@@ -197,7 +138,7 @@ void cEnderman::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 	// Take damage when touching water, drowning damage seems to be most appropriate
 	if (CheckRain() || IsSwimming())
 	{
-		EventLosePlayer();
+		// EventLosePlayer(); //mobTodo
 		TakeDamage(dtDrowning, nullptr, 1, 0);
 		// TODO teleport to a safe location
 	}