summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Fabian <jonfabe@github>2014-12-04 05:04:53 +0100
committerJonathan Fabian <jonfabe@github>2014-12-04 05:04:53 +0100
commit6ca47185c467a8972ecea66df44c2145e061053e (patch)
tree8af4360ac2fca3893aba719b9a4338f7135c69d1
parentFix Spaces to Tabs (diff)
downloadcuberite-6ca47185c467a8972ecea66df44c2145e061053e.tar
cuberite-6ca47185c467a8972ecea66df44c2145e061053e.tar.gz
cuberite-6ca47185c467a8972ecea66df44c2145e061053e.tar.bz2
cuberite-6ca47185c467a8972ecea66df44c2145e061053e.tar.lz
cuberite-6ca47185c467a8972ecea66df44c2145e061053e.tar.xz
cuberite-6ca47185c467a8972ecea66df44c2145e061053e.tar.zst
cuberite-6ca47185c467a8972ecea66df44c2145e061053e.zip
-rw-r--r--src/Entities/Player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index e066df1bd..bafd06277 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -120,7 +120,7 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName) :
{
m_CanFly = true;
}
- if (World->IsGameModeSpectator()) //Otherwise Player will fall out of the world on join
+ if (World->IsGameModeSpectator()) // Otherwise Player will fall out of the world on join
{
m_CanFly = true;
m_IsFlying = true;
@@ -1899,7 +1899,7 @@ 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()))
+ if (!IsGameModeCreative() && !IsGameModeSpectator())
{
super::TickBurning(a_Chunk);
}