diff options
| author | Mattes D <github@xoft.cz> | 2014-09-29 08:08:14 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-09-29 08:08:14 +0200 |
| commit | a245213d8191c3b36ce5b6fdcb003b1bb7466404 (patch) | |
| tree | 364dcce52b54b93feaf6bbe308d9d780548e4137 | |
| parent | Plugin messages: Vanilla prefixes its payloads with VarInt lengths. (diff) | |
| parent | Derp (diff) | |
| download | cuberite-a245213d8191c3b36ce5b6fdcb003b1bb7466404.tar cuberite-a245213d8191c3b36ce5b6fdcb003b1bb7466404.tar.gz cuberite-a245213d8191c3b36ce5b6fdcb003b1bb7466404.tar.bz2 cuberite-a245213d8191c3b36ce5b6fdcb003b1bb7466404.tar.lz cuberite-a245213d8191c3b36ce5b6fdcb003b1bb7466404.tar.xz cuberite-a245213d8191c3b36ce5b6fdcb003b1bb7466404.tar.zst cuberite-a245213d8191c3b36ce5b6fdcb003b1bb7466404.zip | |
| -rw-r--r-- | src/Mobs/Enderman.cpp | 20 | ||||
| -rw-r--r-- | src/Mobs/Enderman.h | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp index 51255beb3..567714382 100644 --- a/src/Mobs/Enderman.cpp +++ b/src/Mobs/Enderman.cpp @@ -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 + } + +} diff --git a/src/Mobs/Enderman.h b/src/Mobs/Enderman.h index 4583746e7..947c32b96 100644 --- a/src/Mobs/Enderman.h +++ b/src/Mobs/Enderman.h @@ -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; } |