diff options
| author | archshift <admin@archshift.com> | 2014-04-25 15:26:08 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-04-25 15:26:08 +0200 |
| commit | 8aa82d048d4506c963846d5c02650e1037e92992 (patch) | |
| tree | 5883691e9e9f5b925a9deb35cfa59f66373c4ab0 | |
| parent | Comments for TrySpawnChicken() and TeleportUser(). (diff) | |
| download | cuberite-8aa82d048d4506c963846d5c02650e1037e92992.tar cuberite-8aa82d048d4506c963846d5c02650e1037e92992.tar.gz cuberite-8aa82d048d4506c963846d5c02650e1037e92992.tar.bz2 cuberite-8aa82d048d4506c963846d5c02650e1037e92992.tar.lz cuberite-8aa82d048d4506c963846d5c02650e1037e92992.tar.xz cuberite-8aa82d048d4506c963846d5c02650e1037e92992.tar.zst cuberite-8aa82d048d4506c963846d5c02650e1037e92992.zip | |
| -rw-r--r-- | src/Entities/ProjectileEntity.cpp | 6 | ||||
| -rw-r--r-- | src/Entities/ProjectileEntity.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index 89b833abf..fd3e80e5f 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -671,7 +671,7 @@ cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X void cThrownEnderPearlEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) { // TODO: Tweak a_HitPos based on block face. - TeleportUser(a_HitPos); + TeleportCreator(a_HitPos); Destroy(); } @@ -685,7 +685,7 @@ void cThrownEnderPearlEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d int TotalDamage = 0; // TODO: If entity is Ender Crystal, destroy it - TeleportUser(a_HitPos); + TeleportCreator(a_HitPos); a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1); Destroy(true); @@ -695,7 +695,7 @@ void cThrownEnderPearlEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d -void cThrownEnderPearlEntity::TeleportUser(const Vector3d & a_HitPos) +void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos) { // Teleport the creator here, make them take 5 damage: if (m_Creator != NULL) diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h index 5aa489ff8..731dd060e 100644 --- a/src/Entities/ProjectileEntity.h +++ b/src/Entities/ProjectileEntity.h @@ -242,8 +242,8 @@ protected: virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; - // Teleports the user where the ender pearl lands. - void TeleportUser(const Vector3d & a_HitPos); + // Teleports the creator where the ender pearl lands. + void TeleportCreator(const Vector3d & a_HitPos); // tolua_begin |