diff options
author | Lane Kolbly <lane@rscheme.org> | 2017-08-30 01:35:53 +0200 |
---|---|---|
committer | Safwat Halaby <LogicParrot@users.noreply.github.com> | 2017-08-30 01:35:53 +0200 |
commit | 1f9788a80119814d1082015479731291a9cbfbad (patch) | |
tree | 9d7942f04b364221474135327c35b34af072d9be /src/Entities/Entity.cpp | |
parent | cUUID: Fix FromHexDigit for digits >= 'a' (diff) | |
download | cuberite-1f9788a80119814d1082015479731291a9cbfbad.tar cuberite-1f9788a80119814d1082015479731291a9cbfbad.tar.gz cuberite-1f9788a80119814d1082015479731291a9cbfbad.tar.bz2 cuberite-1f9788a80119814d1082015479731291a9cbfbad.tar.lz cuberite-1f9788a80119814d1082015479731291a9cbfbad.tar.xz cuberite-1f9788a80119814d1082015479731291a9cbfbad.tar.zst cuberite-1f9788a80119814d1082015479731291a9cbfbad.zip |
Diffstat (limited to 'src/Entities/Entity.cpp')
-rw-r--r-- | src/Entities/Entity.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 347c0ec91..836e69961 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1353,12 +1353,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; } @@ -1378,7 +1379,7 @@ bool cEntity::DetectPortal() m_PortalCooldownData.m_ShouldPreventTeleportation = true; } - MoveToWorld(m_NewWorld, false, m_NewWorldPosition); + MoveToWorld(m_NewWorld, m_WorldChangeSendRespawn, m_NewWorldPosition); return true; } |