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

Players in creative and spectator aren't affected by cacti (#3824)

Browse Source
This commit is contained in:
Bond-009 2017-07-02 07:39:19 +02:00 committed by Lukas Pioch
parent 445abe001a
commit cf22bc4e60
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Entities/Entity.cpp
View File

@ -911,7 +911,10 @@ void cEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
m_TicksSinceLastVoidDamage = 0; m_TicksSinceLastVoidDamage = 0;
} }
if (IsMob() || IsPlayer() || IsPickup() || IsExpOrb()) if (
IsMob() || IsPickup() || IsExpOrb() ||
(IsPlayer() && !((reinterpret_cast<cPlayer *>(this))->IsGameModeCreative() || (reinterpret_cast<cPlayer *>(this))->IsGameModeSpectator()))
)
{ {
DetectCacti(); DetectCacti();
} }