diff options
| author | Alexander Harkness <me@bearbin.net> | 2016-03-30 12:38:24 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2016-03-30 12:38:24 +0200 |
| commit | 6d1d223d044d2237cc9b5e0c0656bcf2ab07ae77 (patch) | |
| tree | 5e43853a75044a7acad1ef48bf51b3d86c2a1d72 /src/Entities/Entity.h | |
| parent | Merge pull request #3091 from LogicParrot/bed (diff) | |
| parent | MoveToWorld defaults to spawnpoint (diff) | |
| download | cuberite-6d1d223d044d2237cc9b5e0c0656bcf2ab07ae77.tar cuberite-6d1d223d044d2237cc9b5e0c0656bcf2ab07ae77.tar.gz cuberite-6d1d223d044d2237cc9b5e0c0656bcf2ab07ae77.tar.bz2 cuberite-6d1d223d044d2237cc9b5e0c0656bcf2ab07ae77.tar.lz cuberite-6d1d223d044d2237cc9b5e0c0656bcf2ab07ae77.tar.xz cuberite-6d1d223d044d2237cc9b5e0c0656bcf2ab07ae77.tar.zst cuberite-6d1d223d044d2237cc9b5e0c0656bcf2ab07ae77.zip | |
Diffstat (limited to 'src/Entities/Entity.h')
| -rw-r--r-- | src/Entities/Entity.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 75c77e593..b00201f3a 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -406,10 +406,10 @@ public: /** Schedules a MoveToWorld call to occur on the next Tick of the entity */ void ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_SetPortalCooldown = false); - bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition) { return DoMoveToWorld(a_World, a_ShouldSendRespawn, a_NewPosition); } + bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition); /** Moves entity to specified world, taking a world pointer */ - bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn = true) { return MoveToWorld(a_World, a_ShouldSendRespawn, GetPosition()); } + bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn = true); /** Moves entity to specified world, taking a world name */ bool MoveToWorld(const AString & a_WorldName, bool a_ShouldSendRespawn = true); |