summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Redshaw <killakan002@hotmail.com>2013-12-31 05:30:20 +0100
committerMorgan Redshaw <killakan002@hotmail.com>2013-12-31 05:30:20 +0100
commit782818ffb520553e772bc5a4638009664a821f90 (patch)
tree9653a463a9307901bdc82472fb08573cc9290367
parentFixed compilation in VC2008. (diff)
downloadcuberite-782818ffb520553e772bc5a4638009664a821f90.tar
cuberite-782818ffb520553e772bc5a4638009664a821f90.tar.gz
cuberite-782818ffb520553e772bc5a4638009664a821f90.tar.bz2
cuberite-782818ffb520553e772bc5a4638009664a821f90.tar.lz
cuberite-782818ffb520553e772bc5a4638009664a821f90.tar.xz
cuberite-782818ffb520553e772bc5a4638009664a821f90.tar.zst
cuberite-782818ffb520553e772bc5a4638009664a821f90.zip
-rw-r--r--CONTRIBUTORS1
-rw-r--r--src/Entities/Player.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bd6b204a4..150bcf09e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -19,5 +19,6 @@ SamJBarney
worktycho
Sxw1212
tonibm19
+Diusrex
Please add yourself to this list if you contribute to MCServer.
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 67d5a47ef..bc92790aa 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -908,8 +908,8 @@ bool cPlayer::IsGameModeSurvival(void) const
bool cPlayer::IsGameModeAdventure(void) const
{
- return (m_GameMode == gmCreative) || // Either the player is explicitly in Adventure
- ((m_GameMode == gmNotSet) && m_World->IsGameModeCreative()); // or they inherit from the world and the world is Adventure
+ return (m_GameMode == gmAdventure) || // Either the player is explicitly in Adventure
+ ((m_GameMode == gmNotSet) && m_World->IsGameModeAdventure()); // or they inherit from the world and the world is Adventure
}