diff options
| author | bibo38 <bibo38@users.noreply.github.com> | 2016-10-12 14:38:45 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2016-10-12 14:38:45 +0200 |
| commit | cb640ffea4a51a10db2e379ada8dc0487378ba09 (patch) | |
| tree | 780ff243f439c9663b2f88e5df2805cc503f4f1d /src/Mobs/Enderman.cpp | |
| parent | Fixed cProjectileEntity double destroy bug (#3397) (diff) | |
| download | cuberite-cb640ffea4a51a10db2e379ada8dc0487378ba09.tar cuberite-cb640ffea4a51a10db2e379ada8dc0487378ba09.tar.gz cuberite-cb640ffea4a51a10db2e379ada8dc0487378ba09.tar.bz2 cuberite-cb640ffea4a51a10db2e379ada8dc0487378ba09.tar.lz cuberite-cb640ffea4a51a10db2e379ada8dc0487378ba09.tar.xz cuberite-cb640ffea4a51a10db2e379ada8dc0487378ba09.tar.zst cuberite-cb640ffea4a51a10db2e379ada8dc0487378ba09.zip | |
Diffstat (limited to 'src/Mobs/Enderman.cpp')
| -rw-r--r-- | src/Mobs/Enderman.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp index 2ff547c3c..4e2e67f8a 100644 --- a/src/Mobs/Enderman.cpp +++ b/src/Mobs/Enderman.cpp @@ -23,8 +23,8 @@ public: virtual bool Item(cPlayer * a_Player) override { - // Don't check players who are in creative gamemode - if (a_Player->IsGameModeCreative()) + // Don't check players who cannot be targeted + if (!a_Player->CanMobsTarget()) { return false; } @@ -124,13 +124,16 @@ void cEnderman::CheckEventSeePlayer(cChunk & a_Chunk) return; } - if (!Callback.GetPlayer()->IsGameModeCreative()) + if (!Callback.GetPlayer()->CanMobsTarget()) { - cMonster::EventSeePlayer(Callback.GetPlayer(), a_Chunk); - m_EMState = CHASING; - m_bIsScreaming = true; - GetWorld()->BroadcastEntityMetadata(*this); + return; } + + // Target the player + cMonster::EventSeePlayer(Callback.GetPlayer(), a_Chunk); + m_EMState = CHASING; + m_bIsScreaming = true; + GetWorld()->BroadcastEntityMetadata(*this); } |