diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-03-12 18:12:13 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-03-12 18:12:13 +0100 |
| commit | d904e89712ee87b4b2bb73c6568f230fff15933a (patch) | |
| tree | 50b4530dde0a80d1271c3bc1dab770f1f69fc7cd /src/Entities/ProjectileEntity.cpp | |
| parent | Added macros support to tools (diff) | |
| parent | Fixed printf format compatabilty (diff) | |
| download | cuberite-d904e89712ee87b4b2bb73c6568f230fff15933a.tar cuberite-d904e89712ee87b4b2bb73c6568f230fff15933a.tar.gz cuberite-d904e89712ee87b4b2bb73c6568f230fff15933a.tar.bz2 cuberite-d904e89712ee87b4b2bb73c6568f230fff15933a.tar.lz cuberite-d904e89712ee87b4b2bb73c6568f230fff15933a.tar.xz cuberite-d904e89712ee87b4b2bb73c6568f230fff15933a.tar.zst cuberite-d904e89712ee87b4b2bb73c6568f230fff15933a.zip | |
Diffstat (limited to 'src/Entities/ProjectileEntity.cpp')
| -rw-r--r-- | src/Entities/ProjectileEntity.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index 12d2025ec..f4ab825f2 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -663,8 +663,6 @@ cThrownSnowballEntity::cThrownSnowballEntity(cEntity * a_Creator, double a_X, do void cThrownSnowballEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) { - // TODO: Apply damage to certain mobs (blaze etc.) and anger all mobs - Destroy(); } @@ -672,6 +670,30 @@ void cThrownSnowballEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFac +void cThrownSnowballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) +{ + int TotalDamage = 0; + if (a_EntityHit.IsMob()) + { + cMonster::eType MobType = ((cMonster &) a_EntityHit).GetMobType(); + if (MobType == cMonster::mtBlaze) + { + TotalDamage = 3; + } + else if (MobType == cMonster::mtEnderDragon) + { + TotalDamage = 1; + } + } + a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1); + + Destroy(true); +} + + + + + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // cBottleOEnchantingEntity : |