diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-23 18:08:48 +0200 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-23 18:08:48 +0200 |
commit | 978663b725dd2a7b756b4fcecf0453e42ce16b79 (patch) | |
tree | 9d8bdac1a21de5f8bbb9b2142832516d2c04f816 /src/Mobs/Enderman.cpp | |
parent | d (diff) | |
download | cuberite-978663b725dd2a7b756b4fcecf0453e42ce16b79.tar cuberite-978663b725dd2a7b756b4fcecf0453e42ce16b79.tar.gz cuberite-978663b725dd2a7b756b4fcecf0453e42ce16b79.tar.bz2 cuberite-978663b725dd2a7b756b4fcecf0453e42ce16b79.tar.lz cuberite-978663b725dd2a7b756b4fcecf0453e42ce16b79.tar.xz cuberite-978663b725dd2a7b756b4fcecf0453e42ce16b79.tar.zst cuberite-978663b725dd2a7b756b4fcecf0453e42ce16b79.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Mobs/Enderman.cpp | 63 |
1 files changed, 1 insertions, 62 deletions
diff --git a/src/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp index 5cfe0d4cd..6aa72369f 100644 --- a/src/Mobs/Enderman.cpp +++ b/src/Mobs/Enderman.cpp @@ -98,67 +98,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 +136,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 } |