summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2017-08-30 16:42:58 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2017-08-30 16:42:58 +0200
commitf0d14229706eca615198c888bd8d3b95b663cfb4 (patch)
treedfcb7fb092091b69a80b3b362adf862f80ba1ba0 /src/Entities/Entity.cpp
parentInitial zombies (diff)
parentMerge pull request #3969 from peterbell10/cuboid (diff)
downloadcuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar
cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.gz
cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.bz2
cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.lz
cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.xz
cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.zst
cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.zip
Diffstat (limited to 'src/Entities/Entity.cpp')
-rw-r--r--src/Entities/Entity.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index c4fe1fffd..38443793e 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1355,12 +1355,13 @@ void cEntity::DetectCacti(void)
-void cEntity::ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_SetPortalCooldown)
+void cEntity::ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_SetPortalCooldown, bool a_ShouldSendRespawn)
{
m_NewWorld = a_World;
m_NewWorldPosition = a_NewPosition;
m_IsWorldChangeScheduled = true;
m_WorldChangeSetPortalCooldown = a_SetPortalCooldown;
+ m_WorldChangeSendRespawn = a_ShouldSendRespawn;
}
@@ -1380,7 +1381,7 @@ bool cEntity::DetectPortal()
m_PortalCooldownData.m_ShouldPreventTeleportation = true;
}
- MoveToWorld(m_NewWorld, false, m_NewWorldPosition);
+ MoveToWorld(m_NewWorld, m_WorldChangeSendRespawn, m_NewWorldPosition);
return true;
}