diff options
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Entity.h | 4 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 2 |
2 files changed, 3 insertions, 3 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 { |