Core/Misc: Kill copy/move constructors for singleton classes

3 files changed, 17 insertions, 6 deletions

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 39924cc3b57..56c6c7d5ca7 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -321,6 +321,11 @@ class TC_GAME_API MapScript
 
     public:
 
+        MapScript(MapScript const& right) = delete;
+        MapScript(MapScript&& right) = delete;
+        MapScript& operator=(MapScript const& right) = delete;
+        MapScript& operator=(MapScript&& right) = delete;
+
         // Gets the MapEntry structure associated with this script. Can return NULL.
         MapEntry const* GetEntry() const;
 
diff --git a/src/server/game/Scripting/ScriptReloadMgr.h b/src/server/game/Scripting/ScriptReloadMgr.h
index 3a0b9f3928e..c00535c9c59 100644
--- a/src/server/game/Scripting/ScriptReloadMgr.h
+++ b/src/server/game/Scripting/ScriptReloadMgr.h
@@ -38,7 +38,7 @@ class path;
 class ModuleReference
 {
 public:
-    virtual ~ModuleReference() { }
+    virtual ~ModuleReference() = default;
 
     /// Returns the git revision hash of the referenced script module
     virtual char const* GetScriptModuleRevisionHash() const = 0;
@@ -56,10 +56,14 @@ public:
 class TC_GAME_API ScriptReloadMgr
 {
 protected:
-    ScriptReloadMgr() { }
+    ScriptReloadMgr() = default;
 
 public:
-    virtual ~ScriptReloadMgr() { }
+    ScriptReloadMgr(ScriptReloadMgr const&) = delete;
+    ScriptReloadMgr(ScriptReloadMgr&&) = delete;
+    ScriptReloadMgr& operator=(ScriptReloadMgr const&) = delete;
+    ScriptReloadMgr& operator=(ScriptReloadMgr&&) = delete;
+    virtual ~ScriptReloadMgr() = default;
 
     /// Initializes the ScriptReloadMgr
     virtual void Initialize() { }
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 18bcd91e158..8c509b2d4d1 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -30,6 +30,11 @@ struct SplineChainLink;
 class TC_GAME_API SystemMgr
 {
     public:
+        SystemMgr(SystemMgr const&) = delete;
+        SystemMgr(SystemMgr&&) = delete;
+        SystemMgr& operator=(SystemMgr const&) = delete;
+        SystemMgr& operator=(SystemMgr&&) = delete;
+
         static SystemMgr* instance();
 
         // database
@@ -44,9 +49,6 @@ class TC_GAME_API SystemMgr
         SystemMgr();
         ~SystemMgr();
 
-        SystemMgr(SystemMgr const&) = delete;
-        SystemMgr& operator=(SystemMgr const&) = delete;
-
         std::unordered_map<ChainKeyType, std::vector<SplineChainLink>> m_mSplineChainsMap; // spline chains
 };