diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-29 17:36:24 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-29 17:36:24 +0200 |
commit | cb77b39dc6ff19698c504525259aa2c3170aadae (patch) | |
tree | 7cdafe6ef852d95b9d33614a2e3e552721169486 /src | |
parent | Merge branch 'master' into portals (diff) | |
download | cuberite-cb77b39dc6ff19698c504525259aa2c3170aadae.tar cuberite-cb77b39dc6ff19698c504525259aa2c3170aadae.tar.gz cuberite-cb77b39dc6ff19698c504525259aa2c3170aadae.tar.bz2 cuberite-cb77b39dc6ff19698c504525259aa2c3170aadae.tar.lz cuberite-cb77b39dc6ff19698c504525259aa2c3170aadae.tar.xz cuberite-cb77b39dc6ff19698c504525259aa2c3170aadae.tar.zst cuberite-cb77b39dc6ff19698c504525259aa2c3170aadae.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Entities/Entity.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 261afd89d..da578013d 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -617,7 +617,7 @@ void cEntity::Tick(float a_Dt, cChunk & a_Chunk) // Handle drowning HandleAir(); - } + } if (!DetectPortal()) // Our chunk is invalid if we have moved to another world { @@ -1129,7 +1129,7 @@ bool cEntity::DetectPortal() cPlayer * Player = (cPlayer *)this; Player->TeleportToCoords(Player->GetLastBedPos().x, Player->GetLastBedPos().y, Player->GetLastBedPos().z); Player->GetClientHandle()->SendRespawn(dimOverworld); - } + } return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedOverworldName()), false); } @@ -1146,7 +1146,7 @@ bool cEntity::DetectPortal() { ((cPlayer *)this)->AwardAchievement(achEnterTheEnd); ((cPlayer *)this)->GetClientHandle()->SendRespawn(dimEnd); - } + } return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetEndWorldName(), dimEnd, GetWorld()->GetName()), false); } |