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

Send respawn packet by default (#4540)

This commit is contained in:
Mat 2020-03-24 16:54:12 +02:00 committed by GitHub
parent 746160c1e5
commit 782619e3f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Server/Plugins/APIDump/APIDesc.lua
View File

@ -4097,7 +4097,7 @@ local Hash = cCryptoHash.sha1HexString("DataToHash")
IsOptional = true,
},
},
Notes = "Schedules a MoveToWorld call to occur on the next Tick of the entity. If ShouldSetPortalCooldown is false (default), doesn't set any portal cooldown, if it is true, the default portal cooldown is applied to the entity. If ShouldSendRespawn is false (default), no respawn packet is sent, if it is true then a respawn packet is sent to the client. <b>OBSOLETE</b>, use MoveToWorld instead.",
Notes = "Schedules a MoveToWorld call to occur on the next Tick of the entity. If ShouldSetPortalCooldown is false (default), doesn't set any portal cooldown, if it is true, the default portal cooldown is applied to the entity. If ShouldSendRespawn is false, no respawn packet is sent, if it is true (default) then a respawn packet is sent to the client. <b>OBSOLETE</b>, use MoveToWorld instead.",
},
SetGravity =
{

4
src/Entities/Entity.h
View File

@ -469,13 +469,13 @@ public:
virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ);
/** Schedules a MoveToWorld call to occur on the next Tick of the entity */
OBSOLETE void ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_ShouldSetPortalCooldown = false, bool a_ShouldSendRespawn = false)
OBSOLETE void ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_ShouldSetPortalCooldown = false, bool a_ShouldSendRespawn = true)
{
LOGWARNING("ScheduleMoveToWorld is deprecated, use MoveToWorld instead");
MoveToWorld(a_World, a_NewPosition, a_ShouldSetPortalCooldown, a_ShouldSendRespawn);
}
bool MoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_ShouldSetPortalCooldown = false, bool a_ShouldSendRespawn = false);
bool MoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_ShouldSetPortalCooldown = false, bool a_ShouldSendRespawn = true);
bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition)
{

2
src/Entities/Player.cpp
View File

@ -1222,7 +1222,7 @@ void cPlayer::Respawn(void)
if (GetWorld() != m_SpawnWorld)
{
MoveToWorld(m_SpawnWorld, GetLastBedPos(), false);
MoveToWorld(m_SpawnWorld, GetLastBedPos(), false, false);
}
else
{

2
src/NetherPortalScanner.cpp
View File

@ -296,7 +296,7 @@ void cNetherPortalScanner::OnDisabled(void)
}
FLOGD("Placing player at {0}", Position);
m_Entity->MoveToWorld(m_World, Position, true);
m_Entity->MoveToWorld(m_World, Position, true, false);
delete this;
}