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

Make endermen take damage in water

Browse Source
This commit is contained in:
Jonathan Frederick 2014-09-28 13:56:41 -07:00
parent 488c6159df
commit 126b14aa09
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mobs/Enderman.cpp
View File

@ -181,3 +181,23 @@ bool cEnderman::CheckLight()
return true; return true;
} }
void cEnderman::Tick(float a_Dt, cChunk & a_Chunk)
{
super::Tick(a_Dt, a_Chunk);
//TODO take damage in rain
//Take damage when touching water, drowning damage seems to be most appropriate
if (IsSwimming())
{
EventLosePlayer();
TakeDamage(dtDrowning, NULL, 1, 0);
//TODO teleport to a safe location
}
}

1
src/Mobs/Enderman.h
View File

@ -21,6 +21,7 @@ public:
virtual void CheckEventSeePlayer(void) override; virtual void CheckEventSeePlayer(void) override;
virtual void CheckEventLostPlayer(void) override; virtual void CheckEventLostPlayer(void) override;
virtual void EventLosePlayer(void) override; virtual void EventLosePlayer(void) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
bool IsScreaming(void) const {return m_bIsScreaming; } bool IsScreaming(void) const {return m_bIsScreaming; }
BLOCKTYPE GetCarriedBlock(void) const {return CarriedBlock; } BLOCKTYPE GetCarriedBlock(void) const {return CarriedBlock; }