summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/World.cpp6
-rw-r--r--src/World.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/World.cpp b/src/World.cpp
index c2149e4c0..f8c1091f0 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -248,11 +248,11 @@ cWorld::cWorld(const AString & a_WorldName) :
m_SkyDarkness(0),
m_Weather(eWeather_Sunny),
m_WeatherInterval(24000), // Guaranteed 1 day of sunshine at server start :)
+ m_bCommandBlocksEnabled(false),
+ m_bUseChatPrefixes(true),
m_Scoreboard(this),
m_GeneratorCallbacks(*this),
- m_TickThread(*this),
- m_bCommandBlocksEnabled(false),
- m_bUseChatPrefixes(true)
+ m_TickThread(*this)
{
LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str());
diff --git a/src/World.h b/src/World.h
index 26f3993e0..fa83fe73e 100644
--- a/src/World.h
+++ b/src/World.h
@@ -803,6 +803,7 @@ private:
/** Whether command blocks are enabled or not */
bool m_bCommandBlocksEnabled;
+
/** Whether prefixes such as [INFO] are prepended to SendMessageXXX() / BroadcastChatXXX() functions */
bool m_bUseChatPrefixes;
@@ -846,7 +847,7 @@ private:
cWorld(const AString & a_WorldName);
- ~cWorld();
+ virtual ~cWorld();
void Tick(float a_Dt, int a_LastTickDurationMSec);