flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Teleport off of mount when throwing enderpearl (#5179)

Browse Source 
* Teleport off of mount when throwing enderpearl

* Simplify returning boolean

* Oops forgot a semicolon

* Fix code conventions in Player.h
This commit is contained in:
Nate
2021-04-08 06:17:24 -04:00
committed by GitHub
parent 8efe55c62c
commit b2eddbed84
3 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Entities/ThrownEnderPearlEntity.cpp
View File

@@ -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;
}
);