1
0

Merge pull request #488 from Diusrex/master

Fixed cPlayer::IsGameModeAdventure.
This commit is contained in:
Mattes D 2013-12-30 22:44:04 -08:00
commit 8003305075
2 changed files with 3 additions and 2 deletions

View File

@ -19,5 +19,6 @@ SamJBarney
worktycho worktycho
Sxw1212 Sxw1212
tonibm19 tonibm19
Diusrex
Please add yourself to this list if you contribute to MCServer. Please add yourself to this list if you contribute to MCServer.

View File

@ -908,8 +908,8 @@ bool cPlayer::IsGameModeSurvival(void) const
bool cPlayer::IsGameModeAdventure(void) const bool cPlayer::IsGameModeAdventure(void) const
{ {
return (m_GameMode == gmCreative) || // Either the player is explicitly in Adventure return (m_GameMode == gmAdventure) || // Either the player is explicitly in Adventure
((m_GameMode == gmNotSet) && m_World->IsGameModeCreative()); // or they inherit from the world and the world is Adventure ((m_GameMode == gmNotSet) && m_World->IsGameModeAdventure()); // or they inherit from the world and the world is Adventure
} }