diff options
| author | Mattes D <github@xoft.cz> | 2013-12-31 07:44:04 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2013-12-31 07:44:04 +0100 |
| commit | 80033050755ddd025921fd44ea2e88bb558bb3a2 (patch) | |
| tree | 9653a463a9307901bdc82472fb08573cc9290367 | |
| parent | Fixed compilation in VC2008. (diff) | |
| parent | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. (diff) | |
| download | cuberite-80033050755ddd025921fd44ea2e88bb558bb3a2.tar cuberite-80033050755ddd025921fd44ea2e88bb558bb3a2.tar.gz cuberite-80033050755ddd025921fd44ea2e88bb558bb3a2.tar.bz2 cuberite-80033050755ddd025921fd44ea2e88bb558bb3a2.tar.lz cuberite-80033050755ddd025921fd44ea2e88bb558bb3a2.tar.xz cuberite-80033050755ddd025921fd44ea2e88bb558bb3a2.tar.zst cuberite-80033050755ddd025921fd44ea2e88bb558bb3a2.zip | |
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 4 |
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 } |