Merge pull request #18 from azerothcore/sudlud-pach-42-5

fix codestyle, sql to utf8mb4 and add enabled hook lists for performa…

Author: sudlud

data/sql/db-characters/updates/mko_map_exploit.sql

@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `mod_mko_map_exploit` (
   `accountId` INT UNSIGNED NOT NULL,
   `count` SMALLINT(6) UNSIGNED DEFAULT 0,
   PRIMARY KEY (`accountId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

data/sql/db-world/updates/mko_map_lock.sql

@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `mod_mko_map_lock` (
   `zoneID` smallint(6) UNSIGNED DEFAULT NULL,
   `comment` varchar(255) DEFAULT '',
   CONSTRAINT `MKO_Map` UNIQUE (`mapId`, `zoneID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;

src/mod-keepout.cpp

@@ -1,11 +1,11 @@
+#include "AccountMgr.h"
+#include "Chat.h"
 #include "Configuration/Config.h"
-#include "Player.h"
 #include "Creature.h"
-#include "AccountMgr.h"
-#include "ScriptMgr.h"
 #include "Define.h"
 #include "GossipDef.h"
-#include "Chat.h"
+#include "Player.h"
+#include "ScriptMgr.h"
 
 struct MKO
 {
@@ -55,9 +55,7 @@ void checkZoneKeepOut(Player* player)
         CharacterDatabase.Execute("INSERT INTO `mod_mko_map_exploit` (`accountId`, `count`) VALUES ({}, {})", accountId, countWarnings);
 
         if (mko.teleportEnabled)
-        {
             teleportPlayer(player);
-        }
     }
     else
     {
@@ -71,47 +69,42 @@ void checkZoneKeepOut(Player* player)
         else
         {
             if (mko.teleportEnabled && !mko.kickEnabled)
-            {
                 teleportPlayer(player);
-            }
             else if (mko.kickEnabled)
-            {
                 player->GetSession()->KickPlayer("MKO: Entering a place not allowed.", true);
-            }
             else
-            {
                 ChatHandler(player->GetSession()).PSendSysMessage("You have gone to a forbidden place your actions have been logged.");
-            }
         }
     }
 }
 
 class KeepOutPlayerScript : public PlayerScript
 {
 public:
-    KeepOutPlayerScript() : PlayerScript("KeepOutPlayerScript") { }
+    KeepOutPlayerScript() : PlayerScript("KeepOutPlayerScript", {
+        PLAYERHOOK_ON_LOGIN,
+        PLAYERHOOK_ON_UPDATE_ZONE
+    }) { }
 
     void OnPlayerLogin(Player* player) override
     {
         if (sConfigMgr->GetOption<bool>("Announcer.Enable", true))
-        {
             ChatHandler(player->GetSession()).PSendSysMessage("This server is running the |cff4CFF00Keep Out |rmodule.");
-        }
     }
 
     void OnPlayerUpdateZone(Player* player, uint32 /*newZone*/,  uint32 /*newArea*/) override
     {
         if (mko.keepOutEnabled)
-        {
             checkZoneKeepOut(player);
-        }
     }
 };
 
 class KeepOutWorldScript : public WorldScript
 {
 public:
-    KeepOutWorldScript() : WorldScript("KeepOutWorldScript") { }
+    KeepOutWorldScript() : WorldScript("KeepOutWorldScript", {
+        WORLDHOOK_ON_BEFORE_CONFIG_LOAD
+    }) { }
 
     void OnBeforeConfigLoad(bool reload) override
     {