flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld.

Browse Source
This commit is contained in:
Lane Kolbly
2015-06-13 16:09:43 -05:00
parent d961693020
commit 9d620a20a0
6 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NetherPortalScanner.cpp
View File

@@ -49,6 +49,12 @@ void cNetherPortalScanner::OnChunkAvailable(int a_ChunkX, int a_ChunkZ)
if (blocks[i] == E_BLOCK_NETHER_PORTAL)
{
Vector3i Coordinate = cChunkDef::IndexToCoordinate(i);
if (Coordinate.y >= m_MaxY)
{
// This is above the map, don't consider it.
continue;
}
Vector3d PortalLoc = Vector3d(Coordinate.x + a_ChunkX * cChunkDef::Width, Coordinate.y, Coordinate.z + a_ChunkZ * cChunkDef::Width);
if (!m_FoundPortal)
{
@@ -284,7 +290,7 @@ void cNetherPortalScanner::OnDisabled(void)
}
LOGD("Placing player at {%f, %f, %f}", Position.x, Position.y, Position.z);
m_Entity->ScheduleMoveToWorld(m_World, Position);
m_Entity->ScheduleMoveToWorld(m_World, Position, true);
delete this;
}