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.h | |
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 '')
-rw-r--r-- | src/Entities/Entity.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index ace2eb6d7..d143e3814 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -428,7 +428,7 @@ 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 */ - void ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_ShouldSetPortalCooldown = false); + void ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_ShouldSetPortalCooldown = false, bool a_ShouldSendRespawn = false); bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition); @@ -592,6 +592,7 @@ protected: /** State variables for ScheduleMoveToWorld. */ bool m_IsWorldChangeScheduled; bool m_WorldChangeSetPortalCooldown; + bool m_WorldChangeSendRespawn; cWorld * m_NewWorld; Vector3d m_NewWorldPosition; |