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

Added magma block contact damage (#5055)

Browse Source 
* Added magma block contact damage
* Fireproof entities do not take damage from magma
* Fire resistance prevents magma damage
* No magma damage when hovering over magma block
This commit is contained in:
Aiden Neill
2020-11-25 10:56:55 -07:00
committed by GitHub
parent e35519ec8a
commit 3d044d2dde
6 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Entities/Entity.cpp
View File

@@ -147,6 +147,7 @@ bool cEntity::Initialize(OwnedEntity a_Self, cWorld & a_EntityWorld)
);
*/
ASSERT(m_World == nullptr);
ASSERT(GetParentChunk() == nullptr);
SetWorld(&a_EntityWorld);
@@ -628,6 +629,7 @@ bool cEntity::ArmorCoversAgainst(eDamageType a_DamageType)
case dtAttack:
case dtArrowAttack:
case dtCactusContact:
case dtMagmaContact:
case dtLavaContact:
case dtFireContact:
case dtExplosion:
@@ -656,7 +658,7 @@ float cEntity::GetEnchantmentCoverAgainst(const cEntity * a_Attacker, eDamageTyp
TotalEPF += static_cast<int>(Item.m_Enchantments.GetLevel(cEnchantments::enchProtection)) * 1;
}
if ((a_DamageType == dtBurning) || (a_DamageType == dtFireContact) || (a_DamageType == dtLavaContact))
if ((a_DamageType == dtBurning) || (a_DamageType == dtFireContact) || (a_DamageType == dtLavaContact) || (a_DamageType == dtMagmaContact))
{
TotalEPF += static_cast<int>(Item.m_Enchantments.GetLevel(cEnchantments::enchFireProtection)) * 2;
}
@@ -899,6 +901,23 @@ void cEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
DetectCacti();
}
// Handle magma block damage
if
(
IsOnGround() &&
(
(IsMob() && !static_cast<cPawn *>(this)->IsFireproof()) ||
(
IsPlayer() && !((static_cast<cPlayer *>(this))->IsGameModeCreative() || (static_cast<cPlayer *>(this))->IsGameModeSpectator())
&& !static_cast<cPlayer *>(this)->IsFireproof()
&& !static_cast<cPlayer *>(this)->HasEntityEffect(cEntityEffect::effFireResistance)
)
)
)
{
DetectMagma();
}
// Handle drowning:
if (IsMob() || IsPlayer())
{
@@ -1314,6 +1333,35 @@ void cEntity::DetectCacti(void)
void cEntity::DetectMagma(void)
{
int MinX = FloorC(GetPosX() - m_Width / 2);
int MaxX = FloorC(GetPosX() + m_Width / 2);
int MinZ = FloorC(GetPosZ() - m_Width / 2);
int MaxZ = FloorC(GetPosZ() + m_Width / 2);
int MinY = Clamp(POSY_TOINT - 1, 0, cChunkDef::Height - 1);
int MaxY = Clamp(FloorC(GetPosY() + m_Height), 0, cChunkDef::Height - 1);
for (int x = MinX; x <= MaxX; x++)
{
for (int z = MinZ; z <= MaxZ; z++)
{
for (int y = MinY; y <= MaxY; y++)
{
if (GetWorld()->GetBlock(x, y, z) == E_BLOCK_MAGMA)
{
TakeDamage(dtMagmaContact, nullptr, 1, 0);
return;
}
} // for y
} // for z
} // for x
}
bool cEntity::DetectPortal()
{
// If somebody scheduled a world change, do nothing.
@@ -2334,6 +2382,3 @@ float cEntity::GetExplosionExposureRate(Vector3d a_ExplosionPosition, float a_Ex
return 0;
}
}