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

Thrown potions/enderpearls: cleanup

Browse Source
This commit is contained in:
Tiger Wang
2021-04-10 16:58:39 +01:00
parent 951e6c76a7
commit 3001e23e8c
7 changed files with 67 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Entities/Player.cpp
View File

@@ -1410,9 +1410,11 @@ void cPlayer::TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ)
// ask plugins to allow teleport to the new position.
if (!cRoot::Get()->GetPluginManager()->CallHookEntityTeleport(*this, m_LastPosition, Vector3d(a_PosX, a_PosY, a_PosZ)))
{
m_IsTeleporting = true;
Detach();
SetPosition({a_PosX, a_PosY, a_PosZ});
FreezeInternal(GetPosition(), false);
m_IsTeleporting = true;
m_ClientHandle->SendPlayerMoveLook();
}
@@ -2588,15 +2590,6 @@ void cPlayer::AttachTo(cEntity * a_AttachTo)
void cPlayer::Detach()
{
Detach(false);
}
void cPlayer::Detach(bool a_IsTeleporting)
{
if (m_AttachedTo == nullptr)
{
@@ -2604,7 +2597,7 @@ void cPlayer::Detach(bool a_IsTeleporting)
return;
}
// Different detach, if this is a spectator
// Different detach, if this is a spectator:
if (IsGameModeSpectator())
{
GetClientHandle()->SendCameraSetTo(*this);
@@ -2615,8 +2608,8 @@ void cPlayer::Detach(bool a_IsTeleporting)
Super::Detach();
// If they are teleporting, no need to figure out position
if (a_IsTeleporting)
// If they are teleporting, no need to figure out position:
if (m_IsTeleporting)
{
return;
}