summaryrefslogtreecommitdiffstats
path: root/src/Entities/ThrownEnderPearlEntity.cpp
diff options
context:
space:
mode:
authorNate <nate@natedpalm.com>2021-04-08 12:17:24 +0200
committerGitHub <noreply@github.com>2021-04-08 12:17:24 +0200
commitb2eddbed84d55978337d1b52f6a9a2eabb658017 (patch)
treea5d82669cf41867c5eec12542ed71f74c4056374 /src/Entities/ThrownEnderPearlEntity.cpp
parentChange to Cuboid calculation for splash distance (#5176) (diff)
downloadcuberite-b2eddbed84d55978337d1b52f6a9a2eabb658017.tar
cuberite-b2eddbed84d55978337d1b52f6a9a2eabb658017.tar.gz
cuberite-b2eddbed84d55978337d1b52f6a9a2eabb658017.tar.bz2
cuberite-b2eddbed84d55978337d1b52f6a9a2eabb658017.tar.lz
cuberite-b2eddbed84d55978337d1b52f6a9a2eabb658017.tar.xz
cuberite-b2eddbed84d55978337d1b52f6a9a2eabb658017.tar.zst
cuberite-b2eddbed84d55978337d1b52f6a9a2eabb658017.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ThrownEnderPearlEntity.cpp24
1 files changed, 21 insertions, 3 deletions
diff --git a/src/Entities/ThrownEnderPearlEntity.cpp b/src/Entities/ThrownEnderPearlEntity.cpp
index 4f1029b27..ec4af7a7c 100644
--- a/src/Entities/ThrownEnderPearlEntity.cpp
+++ b/src/Entities/ThrownEnderPearlEntity.cpp
@@ -34,12 +34,29 @@ void cThrownEnderPearlEntity::OnHitSolidBlock(Vector3d a_HitPos, eBlockFace a_Hi
void cThrownEnderPearlEntity::OnHitEntity(cEntity & a_EntityHit, Vector3d a_HitPos)
{
int TotalDamage = 0;
+
+ bool isAttachedEntity = GetWorld()->FindAndDoWithPlayer(m_CreatorData.m_Name, [& a_EntityHit](cPlayer & a_Entity)
+ {
+ const cEntity * attachedEntity = a_Entity.GetAttached();
+ if (attachedEntity == nullptr)
+ {
+ // nothing attached
+ return false;
+ }
+
+ return attachedEntity->GetUniqueID() == a_EntityHit.GetUniqueID();
+ }
+ );
// TODO: If entity is Ender Crystal, destroy it
- TeleportCreator(a_HitPos);
- a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
- m_DestroyTimer = 5;
+ if (!isAttachedEntity)
+ {
+ TeleportCreator(a_HitPos);
+ a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
+ m_DestroyTimer = 5;
+ }
+
}
@@ -79,6 +96,7 @@ void cThrownEnderPearlEntity::TeleportCreator(Vector3d a_HitPos)
// Teleport the creator here, make them take 5 damage:
a_Entity.TeleportToCoords(a_HitPos.x, a_HitPos.y + 0.2, a_HitPos.z);
a_Entity.TakeDamage(dtEnderPearl, this, 5, 0);
+ a_Entity.Detach(true);
return true;
}
);