diff options
| author | madmaxoft <github@xoft.cz> | 2013-08-30 23:48:03 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-08-30 23:48:03 +0200 |
| commit | 42ea85786a44b519eb79f08a350020ed693d2e0e (patch) | |
| tree | 86b06faa5bbd6f65c4c04a25504c979e467b2905 /source/Entities/ProjectileEntity.cpp | |
| parent | AnvilStats: Implemented a cImageComposingCallback class. (diff) | |
| download | cuberite-42ea85786a44b519eb79f08a350020ed693d2e0e.tar cuberite-42ea85786a44b519eb79f08a350020ed693d2e0e.tar.gz cuberite-42ea85786a44b519eb79f08a350020ed693d2e0e.tar.bz2 cuberite-42ea85786a44b519eb79f08a350020ed693d2e0e.tar.lz cuberite-42ea85786a44b519eb79f08a350020ed693d2e0e.tar.xz cuberite-42ea85786a44b519eb79f08a350020ed693d2e0e.tar.zst cuberite-42ea85786a44b519eb79f08a350020ed693d2e0e.zip | |
Diffstat (limited to 'source/Entities/ProjectileEntity.cpp')
| -rw-r--r-- | source/Entities/ProjectileEntity.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/Entities/ProjectileEntity.cpp b/source/Entities/ProjectileEntity.cpp index 91b2c97a8..8f9f3b480 100644 --- a/source/Entities/ProjectileEntity.cpp +++ b/source/Entities/ProjectileEntity.cpp @@ -316,7 +316,13 @@ cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X void cThrownEnderPearlEntity::OnHitSolidBlock(int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace) { - // TODO: Teleport the creator here, make them take 5 damage + // Teleport the creator here, make them take 5 damage: + if (m_Creator != NULL) + { + // TODO: The coords might need some tweaking based on the block face + m_Creator->TeleportToCoords(a_BlockX + 0.5, a_BlockY + 1.7, a_BlockZ + 0.5); + m_Creator->TakeDamage(dtEnderPearl, this, 5, 0); + } Destroy(); } |