From 97ddcc1c0ae13cf585959e655d55e215b2c5eca6 Mon Sep 17 00:00:00 2001 From: Gargaj Date: Sun, 8 Nov 2015 20:53:32 +0100 Subject: neutral mobs shouldn't chase the player unless aggro'd code style neutral mobs shouldn't chase the player unless aggro'd neutral mobs shouldn't chase the player unless aggro'd Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo Conflicts: src/Mobs/PassiveAggressiveMonster.h code style Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo --- src/Mobs/Enderman.cpp | 2 +- src/Mobs/PassiveAggressiveMonster.cpp | 6 ++++++ src/Mobs/PassiveAggressiveMonster.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) 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; } ; -- cgit v1.2.3