summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2020-04-13 18:38:06 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-16 22:07:48 +0200
commit9ee47e59995f858ec531b3ee467f131594e4ba1f (patch)
treef005d8af4a0362d7eab8a96a71aca0d73275f8e1 /src/World.h
parentPrevent crash when breeding (diff)
downloadcuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.gz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.bz2
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.lz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.xz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.zst
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.zip
Diffstat (limited to '')
-rw-r--r--src/World.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/World.h b/src/World.h
index bf8c08b64..973ccc117 100644
--- a/src/World.h
+++ b/src/World.h
@@ -73,15 +73,19 @@ class cWorld // tolua_export
public:
// tolua_end
+
+
/** A simple RAII locker for the chunkmap - locks the chunkmap in its constructor, unlocks it in the destructor */
- class cLock :
+ class cLock:
public cCSLock
{
- typedef cCSLock super;
+ using Super = cCSLock;
public:
cLock(cWorld & a_World);
};
+
+
static const char * GetClassStatic(void) // Needed for ManualBindings's ForEach templates
{
return "cWorld";
@@ -1098,11 +1102,15 @@ private:
friend class cRoot;
- class cTickThread :
+
+
+ class cTickThread:
public cIsThread
{
- typedef cIsThread super;
+ using Super = cIsThread;
+
public:
+
cTickThread(cWorld & a_World);
protected:
@@ -1112,6 +1120,8 @@ private:
virtual void Execute(void) override;
} ;
+
+
/** Implementation of the callbacks that the ChunkGenerator uses to store new chunks and interface to plugins */
class cChunkGeneratorCallbacks :
public cChunkGeneratorThread::cChunkSink,