flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2625 from Gargaj/chilloutyo

Browse Source 
Neutral mobs should be neutral
This commit is contained in:
worktycho 2015-11-09 10:37:26 +00:00
commit 1e93d2f73c
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mobs/Enderman.cpp
View File

@ -126,7 +126,7 @@ void cEnderman::CheckEventSeePlayer()
if (!Callback.GetPlayer()->IsGameModeCreative()) if (!Callback.GetPlayer()->IsGameModeCreative())
{ {
super::EventSeePlayer(Callback.GetPlayer()); cMonster::EventSeePlayer(Callback.GetPlayer());
m_EMState = CHASING; m_EMState = CHASING;
m_bIsScreaming = true; m_bIsScreaming = true;
GetWorld()->BroadcastEntityMetadata(*this); GetWorld()->BroadcastEntityMetadata(*this);

6
src/Mobs/PassiveAggressiveMonster.cpp
View File

@ -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
}

1
src/Mobs/PassiveAggressiveMonster.h
View File

@ -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); 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 bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
virtual void EventSeePlayer(cEntity *) override;
} ; } ;