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

Merge pull request #1478 from doublej472/master

Browse Source 
Make endermen take damage in water
This commit is contained in:
Mattes D 2014-09-29 08:08:14 +02:00
commit a245213d81
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;
}
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 CheckEventLostPlayer(void) override;
virtual void EventLosePlayer(void) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
bool IsScreaming(void) const {return m_bIsScreaming; }
BLOCKTYPE GetCarriedBlock(void) const {return CarriedBlock; }