summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMat <mail@mathias.is>2020-03-24 15:54:12 +0100
committerGitHub <noreply@github.com>2020-03-24 15:54:12 +0100
commit782619e3f84568b0c98ec690a54820aba02ab6b6 (patch)
treed1ecf9a3f50f283d430b8dcf0037657b9f5f4489 /src
parentUpdate Core (diff)
downloadcuberite-782619e3f84568b0c98ec690a54820aba02ab6b6.tar
cuberite-782619e3f84568b0c98ec690a54820aba02ab6b6.tar.gz
cuberite-782619e3f84568b0c98ec690a54820aba02ab6b6.tar.bz2
cuberite-782619e3f84568b0c98ec690a54820aba02ab6b6.tar.lz
cuberite-782619e3f84568b0c98ec690a54820aba02ab6b6.tar.xz
cuberite-782619e3f84568b0c98ec690a54820aba02ab6b6.tar.zst
cuberite-782619e3f84568b0c98ec690a54820aba02ab6b6.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/Entity.h4
-rw-r--r--src/Entities/Player.cpp2
-rw-r--r--src/NetherPortalScanner.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index a6404a128..ecc94efc9 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -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)
{
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index f673813af..396069f0a 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1222,7 +1222,7 @@ void cPlayer::Respawn(void)
if (GetWorld() != m_SpawnWorld)
{
- MoveToWorld(m_SpawnWorld, GetLastBedPos(), false);
+ MoveToWorld(m_SpawnWorld, GetLastBedPos(), false, false);
}
else
{
diff --git a/src/NetherPortalScanner.cpp b/src/NetherPortalScanner.cpp
index 78cdb2f02..a4564d0f1 100644
--- a/src/NetherPortalScanner.cpp
+++ b/src/NetherPortalScanner.cpp
@@ -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;
}