Merge branch 'development' of https://github.com/vmangos/core into de…

…velopment

# Conflicts:
#	src/game/Handlers/ChatHandler.cpp
#	src/game/World.h
#	src/game/WorldSession.cpp
#	src/game/WorldSession.h

.github/workflows/db_check.yml

@@ -5,13 +5,13 @@ on:
   pull_request:
     paths:
       - '**.sql'
-      - '.github/workflows/**.yml'
+      - '.github/workflows/db_check.yml'
 env:
   REPO_DIR : ${{github.workspace}}
   WORLD_DB : "world_full_14_june_2021"
 jobs:
   build:
-    runs-on: ubuntu-18.04 # 18.04 has mysql5.7 and latest(20.04) has mysql8
+    runs-on: ubuntu-latest # 18.04 has mysql5.7 and latest(20.04) has mysql8
 
     # ... some other config ...
 

.github/workflows/db_dump.yml

@@ -5,14 +5,14 @@ on:
   push:
     paths:
       - '**.sql'
-      - '.github/workflows/**.yml'
+      - '.github/workflows/db_dump.yml'
 
 env:
   REPO_DIR : ${{github.workspace}}
   WORLD_DB : "world_full_14_june_2021"
 jobs:
   build:
-    runs-on: ubuntu-18.04 # 18.04 has mysql5.7 and latest(20.04) has mysql8
+    runs-on: ubuntu-latest # 18.04 has mysql5.7 and latest(20.04) has mysql8
 
     # ... some other config ...
 

.github/workflows/dev-release.yml

@@ -6,6 +6,8 @@ on:
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/ISSUE_TEMPLATE.md'
       - '.github/PULL_REQUEST_TEMPLATE.md'
+      - '.github/workflows/db_check.yml'
+      - '.github/workflows/db_dump.yml'
       - 'sql/**'
       - '.drone.yml'
       - 'README.md'
@@ -81,8 +83,9 @@ jobs:
 
           copy ${{github.workspace}}/ACE_wrappers/lib/ACE.dll ${{github.workspace}}/bin/Release/ACE.dll
           copy c:/mysql/lib/libmysql.dll ${{github.workspace}}/bin/Release/libmysql.dll
-          copy "c:/Program Files/OpenSSL-Win64/bin/libssl-1_1-x64.dll" ${{github.workspace}}/bin/Release/libssl-1_1-x64.dll
-          copy "c:/Program Files/OpenSSL-Win64/bin/libcrypto-1_1-x64.dll" ${{github.workspace}}/bin/Release/libcrypto-1_1-x64.dll
+          copy "c:/Program Files/OpenSSL/bin/libssl-1_1-x64.dll" ${{github.workspace}}/bin/Release/libssl-1_1-x64.dll
+          copy "c:/Program Files/OpenSSL/bin/libcrypto-1_1-x64.dll" ${{github.workspace}}/bin/Release/libcrypto-1_1-x64.dll
+          copy ${{github.workspace}}/dep/windows/lib/x64_release/libeay32.dll ${{github.workspace}}/bin/Release/libeay32.dll
 
           7z a -tzip ${{env.ARCHIVE_FILENAME}} Release
     - name: Archive this artefact
@@ -123,8 +126,9 @@ jobs:
 
           copy ${{github.workspace}}/ACE_wrappers/lib/ACE.dll ${{github.workspace}}/bin/Release/ACE.dll
           copy c:/mysql/lib/libmysql.dll ${{github.workspace}}/bin/Release/libmysql.dll
-          copy "c:/Program Files/OpenSSL-Win64/bin/libssl-1_1-x64.dll" ${{github.workspace}}/bin/Release/libssl-1_1-x64.dll
-          copy "c:/Program Files/OpenSSL-Win64/bin/libcrypto-1_1-x64.dll" ${{github.workspace}}/bin/Release/libcrypto-1_1-x64.dll
+          copy "c:/Program Files/OpenSSL/bin/libssl-1_1-x64.dll" ${{github.workspace}}/bin/Release/libssl-1_1-x64.dll
+          copy "c:/Program Files/OpenSSL/bin/libcrypto-1_1-x64.dll" ${{github.workspace}}/bin/Release/libcrypto-1_1-x64.dll
+          copy ${{github.workspace}}/dep/windows/lib/x64_release/libeay32.dll ${{github.workspace}}/bin/Release/libeay32.dll
 
           7z a -tzip ${{env.ARCHIVE_FILENAME}} Release
     - name: Archive this artefact

.github/workflows/vmangos.yml

@@ -12,6 +12,8 @@ on:
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/ISSUE_TEMPLATE.md'
       - '.github/PULL_REQUEST_TEMPLATE.md'
+      - '.github/workflows/db_check.yml'
+      - '.github/workflows/db_dump.yml'
       - 'sql/**'
       - '.drone.yml'
       - 'README.md'
@@ -24,6 +26,8 @@ on:
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/ISSUE_TEMPLATE.md'
       - '.github/PULL_REQUEST_TEMPLATE.md'
+      - '.github/workflows/db_check.yml'
+      - '.github/workflows/db_dump.yml'
       - 'sql/**'
       - '.drone.yml'
       - 'README.md'

.gitignore

@@ -32,6 +32,7 @@ CMakeSettings.json
 
 # CLion files
 cmake-build-debug
+cmake-build-release
 
 #
 # Top-level generic files

CMakeLists.txt

@@ -15,11 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-project(MaNGOS)
-
 # CMake policies
 cmake_minimum_required(VERSION 3.1...3.20)
 
+project(MaNGOS)
+
 # Allow -DACE_ROOT, -DTBB_ROOT, etc.
 if(${CMAKE_VERSION} VERSION_GREATER "3.11")
   cmake_policy(SET CMP0074 NEW)

cmake/FindOpenSSL.cmake

@@ -40,17 +40,20 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
 
   find_path(OPENSSL_INCLUDE_DIR
     NAMES
-      ssl.h
+      openssl/ssl.h
     PATHS
       /usr/include
       /usr/include/openssl
       /usr/local/include
       /usr/local/include/openssl
       /usr/local/openssl/include
+      /usr/local/opt/[email protected]/include
       /usr/local/opt/openssl
+      /opt/homebrew/opt/[email protected]/include
+      /opt/homebrew/opt/openssl/include
       ${TMP_OPENSSL_INCLUDE_DIR}
     DOC
-      "Specify the directory containing openssl.h."
+      "Specify the directory containing ssl.h."
   )
 
   find_library(OPENSSL_LIBRARIES
@@ -63,7 +66,10 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
       /usr/local/lib
       /usr/local/lib/ssl
       /usr/local/ssl/lib
+      /usr/local/opt/[email protected]/lib
       /usr/local/opt/openssl/lib
+      /opt/homebrew/opt/[email protected]/lib
+      /opt/homebrew/opt/openssl/lib
       ${TMP_OPENSSL_LIBRARIES}
     DOC "Specify the OpenSSL library here."
   )
@@ -89,6 +95,10 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
         /usr/local/lib
         /usr/local/lib/ssl
         /usr/local/ssl/lib
+        /usr/local/opt/[email protected]/lib
+        /usr/local/opt/openssl/lib
+        /opt/homebrew/opt/[email protected]/lib
+        /opt/homebrew/opt/openssl/lib
         ${TMP_OPENSSL_LIBRARIES}
       DOC "if more libraries are necessary to link in a OpenSSL client, specify them here."
     )

contrib/mmap/src/TerrainBuilder.cpp

@@ -1018,7 +1018,7 @@ namespace MMAP
                              &p0[0], &p0[1], &p0[2], &p1[0], &p1[1], &p1[2], &size))
                 continue;
 
-            if (mapID == mid, tileX == tx, tileY == ty)
+            if (mapID == mid && tileX == tx && tileY == ty)
             {
                 meshData.offMeshConnections.append(p0[1]);
                 meshData.offMeshConnections.append(p0[2]);

dep/src/g3dlite/FileSystem.cpp

@@ -40,6 +40,13 @@
 #   define strnicmp strncasecmp 
 #endif
 
+#if defined __aarch64__ && defined __APPLE__
+#    if defined stat64
+#        undef stat64
+#    endif
+#    define stat64 stat
+#endif
+
 namespace G3D {
 
 static FileSystem* common = NULL;

sql/logon.sql

@@ -201,7 +201,7 @@ CREATE TABLE IF NOT EXISTS `uptime` (
   `uptime` bigint(20) unsigned NOT NULL DEFAULT '0',
   `onlineplayers` smallint(5) unsigned NOT NULL DEFAULT '0',
   `maxplayers` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `revision` varchar(255) NOT NULL DEFAULT 'Trinitycore',
+  `revision` varchar(255) NOT NULL DEFAULT 'VMangos',
   PRIMARY KEY (`realmid`,`starttime`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system';