diff options
| author | DaPorkchop_ <DaMatrix@users.noreply.github.com> | 2019-04-18 15:54:55 +0200 |
|---|---|---|
| committer | peterbell10 <peterbell10@live.co.uk> | 2019-04-18 15:54:55 +0200 |
| commit | 10b60971f520e5fa1f07626040f0013757091b44 (patch) | |
| tree | 5a05a3c6a7120690adcf844cd20faf81d89d98d3 /src | |
| parent | Limit the size of cListAllocationPool's free list (diff) | |
| download | cuberite-10b60971f520e5fa1f07626040f0013757091b44.tar cuberite-10b60971f520e5fa1f07626040f0013757091b44.tar.gz cuberite-10b60971f520e5fa1f07626040f0013757091b44.tar.bz2 cuberite-10b60971f520e5fa1f07626040f0013757091b44.tar.lz cuberite-10b60971f520e5fa1f07626040f0013757091b44.tar.xz cuberite-10b60971f520e5fa1f07626040f0013757091b44.tar.zst cuberite-10b60971f520e5fa1f07626040f0013757091b44.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Entities/Player.cpp | 4 | ||||
| -rw-r--r-- | src/NetherPortalScanner.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 044b802b7..07962fec8 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -386,8 +386,8 @@ void cPlayer::TickFreezeCode() { // If we find a position with enough space for the player if ( - (Chunk->GetBlock(Rel.x, NewY, Rel.z) == E_BLOCK_AIR) && - (Chunk->GetBlock(Rel.x, NewY + 1, Rel.z) == E_BLOCK_AIR) + !cBlockInfo::IsSolid(Chunk->GetBlock(Rel.x, NewY, Rel.z)) && + !cBlockInfo::IsSolid(Chunk->GetBlock(Rel.x, NewY + 1, Rel.z)) ) { // If the found position is not the same as the original diff --git a/src/NetherPortalScanner.cpp b/src/NetherPortalScanner.cpp index 4b457de17..9625ed7cf 100644 --- a/src/NetherPortalScanner.cpp +++ b/src/NetherPortalScanner.cpp @@ -9,7 +9,7 @@ -const double cNetherPortalScanner::OutOffset = 2; +const double cNetherPortalScanner::OutOffset = 0.5; const double cNetherPortalScanner::AcrossOffset = 0.5; @@ -278,7 +278,7 @@ void cNetherPortalScanner::OnDisabled(void) FLOGD("Building nether portal at {0}", m_PortalLoc); BuildNetherPortal(m_PortalLoc, m_Dir, m_BuildPlatform); m_PortalLoc.x += 1; - m_PortalLoc.y += 2; + m_PortalLoc.y += 1; m_PortalLoc.z += 1; } |