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

Merge pull request #159 from tigerw/bugfix

Browse Source 
Multiple fixes and features
This commit is contained in:
Mattes D
2013-09-11 12:19:39 -07:00
parent 3abfd46f55 3a1def2c90
commit 85804d085d
5 changed files with 107 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/Entities/Entity.cpp
View File

@@ -55,6 +55,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
, m_TicksSinceLastBurnDamage(0)
, m_TicksSinceLastLavaDamage(0)
, m_TicksSinceLastFireDamage(0)
, m_TicksSinceLastVoidDamage(0)
, m_TicksLeftBurning(0)
, m_WaterSpeed(0, 0, 0)
, m_Width(a_Width)
@@ -505,6 +506,11 @@ void cEntity::Tick(float a_Dt, cChunk & a_Chunk)
{
TickBurning(a_Chunk);
}
if ((a_Chunk.IsValid()) && (GetPosY() < -46))
{
TickInVoid(a_Chunk);
}
else { m_TicksSinceLastVoidDamage = 0; }
}
@@ -524,8 +530,15 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
if ((BlockY >= cChunkDef::Height) || (BlockY < 0))
{
// Outside of the world
// TODO: Current speed should still be added to the entity position
// Otherwise TNT explosions in the void will still effect the bottommost layers of the world
cChunk * NextChunk = a_Chunk.GetNeighborChunk(BlockX, BlockZ);
// See if we can commit our changes. If not, we will discard them.
if (NextChunk != NULL)
{
SetSpeed(NextSpeed);
NextPos += (NextSpeed * a_Dt);
SetPosition(NextPos);
}
return;
}
@@ -829,6 +842,23 @@ void cEntity::TickBurning(cChunk & a_Chunk)
void cEntity::TickInVoid(cChunk & a_Chunk)
{
if (m_TicksSinceLastVoidDamage == 20)
{
TakeDamage(dtInVoid, NULL, 2, 0);
m_TicksSinceLastVoidDamage = 0;
}
else
{
m_TicksSinceLastVoidDamage++;
}
}
/// Called when the entity starts burning
void cEntity::OnStartedBurning(void)
{