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,