Merge branch 'azerothcore:master' into Playerbot

src/common/Collision/Management/MMapFactory.cpp

@@ -28,7 +28,7 @@ namespace MMAP
 
     MMapMgr* MMapFactory::createOrGetMMapMgr()
     {
-        if (g_MMapMgr == nullptr)
+        if (!g_MMapMgr)
         {
             g_MMapMgr = new MMapMgr();
         }

src/common/Utilities/Util.cpp

@@ -219,7 +219,7 @@ bool IsIPAddress(char const* ipaddress)
 uint32 CreatePIDFile(std::string const& filename)
 {
     FILE* pid_file = fopen(filename.c_str(), "w");
-    if (pid_file == nullptr)
+    if (!pid_file)
     {
         return 0;
     }