From e33eb529addf7ca8870a02725e74d7120912eb6e Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Thu, 7 Sep 2017 09:59:08 +0100 Subject: 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 --- src/Entities/Player.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/Entities/Player.cpp') diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index fb2274cad..f9804569f 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -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); } - -- cgit v1.2.3