Teleport off of mount when throwing enderpearl (#5179)
* 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:
parent
8efe55c62c
commit
b2eddbed84
@ -2590,6 +2590,15 @@ void cPlayer::AttachTo(cEntity * a_AttachTo)
|
||||
|
||||
|
||||
void cPlayer::Detach()
|
||||
{
|
||||
Detach(false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void cPlayer::Detach(bool a_IsTeleporting)
|
||||
{
|
||||
if (m_AttachedTo == nullptr)
|
||||
{
|
||||
@ -2607,6 +2616,13 @@ void cPlayer::Detach()
|
||||
}
|
||||
|
||||
Super::Detach();
|
||||
|
||||
// If they are teleporting, no need to figure out position
|
||||
if (a_IsTeleporting)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int PosX = POSX_TOINT;
|
||||
int PosY = POSY_TOINT;
|
||||
int PosZ = POSZ_TOINT;
|
||||
|
@ -604,6 +604,7 @@ public:
|
||||
// cEntity overrides:
|
||||
virtual void AttachTo(cEntity * a_AttachTo) override;
|
||||
virtual void Detach(void) override;
|
||||
virtual void Detach(bool a_IsTeleporting);
|
||||
virtual cItem GetEquippedWeapon(void) const override { return m_Inventory.GetEquippedItem(); }
|
||||
virtual cItem GetEquippedHelmet(void) const override { return m_Inventory.GetEquippedHelmet(); }
|
||||
virtual cItem GetEquippedChestplate(void) const override { return m_Inventory.GetEquippedChestplate(); }
|
||||
|
@ -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;
|
||||
}
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user