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/PassiveAggressiveMonster.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Mobs/PassiveAggressiveMonster.h') 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