summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorJonathan Fabian <jonfabe@github>2014-12-03 02:25:41 +0100
committerJonathan Fabian <jonfabe@github>2014-12-03 02:25:41 +0100
commit24c6da6209be2d6726c1bad441945310f1c4aaab (patch)
tree46b1f6268b05b12b2109a6953a5ab12532842a18 /src/Entities
parentAllow Spectator Gamemode as a world default. (diff)
downloadcuberite-24c6da6209be2d6726c1bad441945310f1c4aaab.tar
cuberite-24c6da6209be2d6726c1bad441945310f1c4aaab.tar.gz
cuberite-24c6da6209be2d6726c1bad441945310f1c4aaab.tar.bz2
cuberite-24c6da6209be2d6726c1bad441945310f1c4aaab.tar.lz
cuberite-24c6da6209be2d6726c1bad441945310f1c4aaab.tar.xz
cuberite-24c6da6209be2d6726c1bad441945310f1c4aaab.tar.zst
cuberite-24c6da6209be2d6726c1bad441945310f1c4aaab.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Player.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index edcdb4799..e422d4042 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -120,6 +120,11 @@ 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
+ {
+ m_CanFly = true;
+ m_IsFlying = true;
+ }
}
cRoot::Get()->GetServer()->PlayerCreated(this);
@@ -1074,7 +1079,7 @@ bool cPlayer::IsGameModeAdventure(void) const
bool cPlayer::IsGameModeSpectator(void) const
{
return (m_GameMode == gmSpectator) || // Either the player is explicitly in Spectator
- ((m_GameMode == gmNotSet) && m_World->IsGameModeSpectator()); // or they inherit from the world and the world is Adventure
+ ((m_GameMode == gmNotSet) && m_World->IsGameModeSpectator()); // or they inherit from the world and the world is Spectator
}
@@ -1893,8 +1898,8 @@ void cPlayer::UseEquippedItem(int a_Amount)
void cPlayer::TickBurning(cChunk & a_Chunk)
{
- // Don't burn in creative and stop burning in creative if necessary
- if (!IsGameModeCreative())
+ // Don't burn in creative or spectator and stop burning in creative if necessary
+ if (!(IsGameModeCreative() || IsGameModeSpectator()))
{
super::TickBurning(a_Chunk);
}
@@ -1913,9 +1918,9 @@ void cPlayer::HandleFood(void)
{
// Ref.: http://www.minecraftwiki.net/wiki/Hunger
- if (IsGameModeCreative())
+ if (IsGameModeCreative() || IsGameModeSpectator())
{
- // Hunger is disabled for Creative
+ // Hunger is disabled for Creative and Spectator
return;
}
@@ -2080,7 +2085,7 @@ void cPlayer::UpdateMovementStats(const Vector3d & a_DeltaPos)
void cPlayer::ApplyFoodExhaustionFromMovement()
{
- if (IsGameModeCreative())
+ if (IsGameModeCreative() || IsGameModeSpectator())
{
return;
}