From ae5975e674122148f979a211bcf82094c5d0a206 Mon Sep 17 00:00:00 2001 From: faketruth Date: Wed, 10 Oct 2012 19:46:12 +0000 Subject: Added an option to disable/enable PVP on a per world basis git-svn-id: http://mc-server.googlecode.com/svn/trunk@944 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/World.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/World.cpp') diff --git a/source/World.cpp b/source/World.cpp index 055a0a75e..fd4f5af6e 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -250,7 +250,8 @@ cWorld::cWorld( const AString & a_WorldName ) m_IsPumpkinBonemealable = IniFile.GetValueSetB("Plants", "IsPumpkinBonemealable", false); m_IsSugarcaneBonemealable = IniFile.GetValueSetB("Plants", "IsSugarcaneBonemealable", false); m_IsCactusBonemealable = IniFile.GetValueSetB("Plants", "IsCactusBonemealable", false); - + m_bEnabledPVP = IniFile.GetValueSetB("PVP", "Enabled", true); + m_GameMode = (eGameMode)IniFile.GetValueSetI("GameMode", "GameMode", m_GameMode ); if (!IniFile.WriteFile()) -- cgit v1.2.3