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.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/World.h') diff --git a/source/World.h b/source/World.h index 0fb2bac7c..654460737 100644 --- a/source/World.h +++ b/source/World.h @@ -68,6 +68,7 @@ public: long long GetWorldTime(void) const { return m_WorldTime; } //tolua_export eGameMode GetGameMode(void) const { return m_GameMode; } //tolua_export + bool IsPVPEnabled(void) const { return m_bEnabledPVP; } //tolua_export void SetWorldTime(long long a_WorldTime) { m_WorldTime = a_WorldTime; } //tolua_export @@ -416,6 +417,7 @@ private: long long m_WorldTime; // Time in seconds*20, this is sent to clients (is wrapped) unsigned long long CurrentTick; eGameMode m_GameMode; + bool m_bEnabledPVP; float m_WorldTimeFraction; // When this > 1.f m_WorldTime is incremented by 20 // The cRedstone class simulates redstone and needs access to m_RSList -- cgit v1.2.3