diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-10-09 14:10:41 +0200 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-10-09 14:10:41 +0200 |
| commit | f951a2528325af8e1a9ef17f9a765ad68825aec7 (patch) | |
| tree | c0fad320c151dec86590c3746dcbaaf5657df11c /src/Entities | |
| parent | Update apidoc (diff) | |
| parent | Updated the Core plugin. (diff) | |
| download | cuberite-f951a2528325af8e1a9ef17f9a765ad68825aec7.tar cuberite-f951a2528325af8e1a9ef17f9a765ad68825aec7.tar.gz cuberite-f951a2528325af8e1a9ef17f9a765ad68825aec7.tar.bz2 cuberite-f951a2528325af8e1a9ef17f9a765ad68825aec7.tar.lz cuberite-f951a2528325af8e1a9ef17f9a765ad68825aec7.tar.xz cuberite-f951a2528325af8e1a9ef17f9a765ad68825aec7.tar.zst cuberite-f951a2528325af8e1a9ef17f9a765ad68825aec7.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Entities/Entity.cpp | 4 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index b2fa56143..48d07fbbc 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1458,7 +1458,7 @@ bool cEntity::DetectPortal() cWorld * TargetWorld = cRoot::Get()->GetWorld(GetWorld()->GetLinkedOverworldName()); ASSERT(TargetWorld != nullptr); // The linkage checker should have prevented this at startup. See cWorld::start() LOGD("Jumping %s -> %s", DimensionToString(dimNether).c_str(), DimensionToString(DestionationDim).c_str()); - new cNetherPortalScanner(this, TargetWorld, TargetPos, 256); + new cNetherPortalScanner(this, TargetWorld, TargetPos, cChunkDef::Height); return true; } // Nether portal in the overworld @@ -1490,7 +1490,7 @@ bool cEntity::DetectPortal() cWorld * TargetWorld = cRoot::Get()->GetWorld(GetWorld()->GetLinkedNetherWorldName()); ASSERT(TargetWorld != nullptr); // The linkage checker should have prevented this at startup. See cWorld::start() LOGD("Jumping %s -> %s", DimensionToString(dimOverworld).c_str(), DimensionToString(DestionationDim).c_str()); - new cNetherPortalScanner(this, TargetWorld, TargetPos, 128); + new cNetherPortalScanner(this, TargetWorld, TargetPos, (cChunkDef::Height / 2)); return true; } } diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 889aef778..5ab5e4567 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -84,6 +84,7 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) : m_BowCharge(0), m_FloaterID(cEntity::INVALID_ID), m_Team(nullptr), + m_bIsInBed(false), m_TicksUntilNextSave(PLAYER_INVENTORY_SAVE_INTERVAL), m_bIsTeleporting(false), m_UUID((a_Client != nullptr) ? a_Client->GetUUID() : ""), |