diff options
| author | worktycho <work.tycho@gmail.com> | 2015-11-09 11:37:26 +0100 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2015-11-09 11:37:26 +0100 |
| commit | 1e93d2f73c241e893752356e86a05d94624d5763 (patch) | |
| tree | 91b6e96dc86a2b6a91bf2ca65f97c0273ee76eb9 | |
| parent | Merge pull request #2626 from cuberite/worktycho-patch-1 (diff) | |
| parent | neutral mobs shouldn't chase the player unless aggro'd (diff) | |
| download | cuberite-1e93d2f73c241e893752356e86a05d94624d5763.tar cuberite-1e93d2f73c241e893752356e86a05d94624d5763.tar.gz cuberite-1e93d2f73c241e893752356e86a05d94624d5763.tar.bz2 cuberite-1e93d2f73c241e893752356e86a05d94624d5763.tar.lz cuberite-1e93d2f73c241e893752356e86a05d94624d5763.tar.xz cuberite-1e93d2f73c241e893752356e86a05d94624d5763.tar.zst cuberite-1e93d2f73c241e893752356e86a05d94624d5763.zip | |
| -rw-r--r-- | src/Mobs/Enderman.cpp | 2 | ||||
| -rw-r--r-- | src/Mobs/PassiveAggressiveMonster.cpp | 6 | ||||
| -rw-r--r-- | src/Mobs/PassiveAggressiveMonster.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp index 30bf82067..ac749e36a 100644 --- a/src/Mobs/Enderman.cpp +++ b/src/Mobs/Enderman.cpp @@ -126,7 +126,7 @@ void cEnderman::CheckEventSeePlayer() if (!Callback.GetPlayer()->IsGameModeCreative()) { - super::EventSeePlayer(Callback.GetPlayer()); + cMonster::EventSeePlayer(Callback.GetPlayer()); m_EMState = CHASING; m_bIsScreaming = true; GetWorld()->BroadcastEntityMetadata(*this); diff --git a/src/Mobs/PassiveAggressiveMonster.cpp b/src/Mobs/PassiveAggressiveMonster.cpp index f5577f71f..e0abd94a5 100644 --- a/src/Mobs/PassiveAggressiveMonster.cpp +++ b/src/Mobs/PassiveAggressiveMonster.cpp @@ -39,3 +39,9 @@ bool cPassiveAggressiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) +void cPassiveAggressiveMonster::EventSeePlayer(cEntity *) +{ + // don't do anything, neutral mobs don't react to just seeing the player +} + + diff --git a/src/Mobs/PassiveAggressiveMonster.h b/src/Mobs/PassiveAggressiveMonster.h index 72f472281..02dad2f40 100644 --- a/src/Mobs/PassiveAggressiveMonster.h +++ b/src/Mobs/PassiveAggressiveMonster.h @@ -16,6 +16,7 @@ public: cPassiveAggressiveMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height); virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override; + virtual void EventSeePlayer(cEntity *) override; } ; |