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

fixed player spawning in the ground.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@42 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
admin@omencraft.com 2011-11-01 22:27:09 +00:00
parent 239d6c8d95
commit bf2806dcb8
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/cChunk.cpp
View File

@ -1387,4 +1387,4 @@ void cChunk::AddTickBlockEntity( cFurnaceEntity* a_Entity )
void cChunk::RemoveTickBlockEntity( cFurnaceEntity* a_Entity )
{
m_pState->m_TickBlockEntities.remove( a_Entity );
}
}

4
source/cClientHandle.cpp
View File

@ -965,6 +965,10 @@ void cClientHandle::Tick(float a_Dt)
// Send health
Send( cPacket_UpdateHealth( (short)m_Player->GetHealth() ) );
//quick bugfix to prevent players from spawning in ground
m_Player->TeleportTo( cRoot::Get()->GetWorld()->GetSpawnX(), cRoot::Get()->GetWorld()->GetSpawnY()+1, cRoot::Get()->GetWorld()->GetSpawnZ() );
World->UnlockEntities();
}
}

5
source/cWorld.cpp
View File

@ -317,7 +317,6 @@ void cWorld::Tick(float a_Dt)
RemoveEntity( *m_pState->m_RemoveEntityQueue.begin() );
}
if( m_bAnimals && ( m_Time - m_SpawnMonsterTime > m_SpawnMonsterRate ) ) // 10 seconds
{
m_SpawnMonsterTime = m_Time;
@ -361,7 +360,6 @@ void cWorld::Tick(float a_Dt)
else if (nightRand == 9)
Monster = new cSkeleton();
//end random percent to spawn for night
} else {
if (dayRand == 0) //random percent to spawn for day
Monster = new cChicken();
@ -398,7 +396,6 @@ void cWorld::GrowTree( int a_X, int a_Y, int a_Z )
int trunk = rand() % (7 - 5 + 1) + 5;
for (int i = 0; i < trunk; i++)
{
if( GetBlock( a_X, a_Y + i, a_Z ) == E_BLOCK_AIR )
FastSetBlock( a_X, a_Y + i, a_Z, E_BLOCK_LOG, 0 );
}
@ -414,7 +411,6 @@ void cWorld::GrowTree( int a_X, int a_Y, int a_Z )
for (int k = a_Z-radius; k <= a_Z + radius; k++) {
// small chance to be missing a block to add a little random
if (k != a_Z || i != a_X && (rand() % 100 + 1) > 20) {
if( GetBlock( i, a_Y + j, k ) == E_BLOCK_AIR )
FastSetBlock(i, a_Y+j, k, E_BLOCK_LEAVES, 0 );
}
@ -426,7 +422,6 @@ void cWorld::GrowTree( int a_X, int a_Y, int a_Z )
}
if( GetBlock( a_X, a_Y+j, a_Z ) == E_BLOCK_AIR )
FastSetBlock( a_X, a_Y+j, a_Z, E_BLOCK_LOG, 0 );
}
}