1
0

Fire effect now shown for creative and spectator mode players (#3998)

* Fire effect now shown for creative and spectator mode players

Fixes #3989

* Add documentation for IsFireproof
This commit is contained in:
Alexander Harkness
2017-09-07 09:59:08 +01:00
committed by GitHub
parent ed7adef1ca
commit e33eb529ad
4 changed files with 31 additions and 27 deletions

View File

@@ -2352,23 +2352,6 @@ void cPlayer::UseEquippedItem(int a_Amount)
void cPlayer::TickBurning(cChunk & a_Chunk)
{
// Don't burn in creative or spectator and stop burning in creative if necessary
if (!IsGameModeCreative() && !IsGameModeSpectator())
{
super::TickBurning(a_Chunk);
}
else if (IsOnFire())
{
m_TicksLeftBurning = 0;
OnFinishedBurning();
}
}
void cPlayer::HandleFood(void)
{
@@ -3018,4 +3001,3 @@ float cPlayer::GetPlayerRelativeBlockHardness(BLOCKTYPE a_Block)
// LOGD("blockHardness: %f, digSpeed: %f, canHarvestBlockDivisor: %f\n", blockHardness, digSpeed, canHarvestBlockDivisor);
return (blockHardness < 0) ? 0 : ((digSpeed / blockHardness) / canHarvestBlockDivisor);
}