summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorr.ramazanov <r.ramazanov@servplus.ru>2014-04-25 08:08:36 +0200
committerr.ramazanov <r.ramazanov@servplus.ru>2014-04-25 08:08:36 +0200
commita72744f5c33ec11f33637839e4d6206c4aa2fa2a (patch)
tree06b055fad5c1a2682f50064446689d4b156c64d6 /src/Entities/Entity.cpp
parentMerge branch 'master' of https://github.com/mc-server/MCServer (diff)
downloadcuberite-a72744f5c33ec11f33637839e4d6206c4aa2fa2a.tar
cuberite-a72744f5c33ec11f33637839e4d6206c4aa2fa2a.tar.gz
cuberite-a72744f5c33ec11f33637839e4d6206c4aa2fa2a.tar.bz2
cuberite-a72744f5c33ec11f33637839e4d6206c4aa2fa2a.tar.lz
cuberite-a72744f5c33ec11f33637839e4d6206c4aa2fa2a.tar.xz
cuberite-a72744f5c33ec11f33637839e4d6206c4aa2fa2a.tar.zst
cuberite-a72744f5c33ec11f33637839e4d6206c4aa2fa2a.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index c09317298..89275a418 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -342,13 +342,13 @@ void cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
switch (KnockbackLevel)
{
case 1:
- additionalSpeed.Set(5, .2, 5);
+ additionalSpeed.Set(5, .3, 5);
break;
case 2:
- additionalSpeed.Set(8, .2, 8);
+ additionalSpeed.Set(8, .3, 8);
break;
default:
- additionalSpeed.Set(2, .2, 2);
+ additionalSpeed.Set(2, .3, 2);
break;
}
AddSpeed(a_TDI.Knockback * additionalSpeed);
@@ -802,12 +802,9 @@ void cEntity::TickBurning(cChunk & a_Chunk)
int PosY = POSY_TOINT;
int PosZ = POSZ_TOINT - a_Chunk.GetPosZ() * cChunkDef::Width;
- if((POSY_TOINT - 1) == m_World->GetHeight(POSX_TOINT, POSZ_TOINT))
+ if (PosY > m_World->GetHeight(POSX_TOINT, POSZ_TOINT))
{
- if (a_Chunk.GetSkyLight(PosX, PosY, PosZ) == 15)
- {
- m_TicksLeftBurning = 0;
- }
+ m_TicksLeftBurning = 0;
}
}