Merge pull request #268 from liyunfan1223/sync_20240610

[Sync] Sync with azerothcore 20240610 (update the core before pull this commit)

.github/workflows/core_build.yml

@@ -31,70 +31,45 @@ jobs:
     name: ${{ matrix.os }}-${{ matrix.cpp_compiler }}
 
     steps:
-    - name: Checkout AzerothCore
-      uses: actions/checkout@v3
-      with:
-        repository: 'liyunfan1223/azerothcore-wotlk'
-        ref: 'Playerbot'
+      - name: Checkout AzerothCore
+        uses: actions/checkout@v3
+        with:
+          repository: 'liyunfan1223/azerothcore-wotlk'
+          ref: 'Playerbot'
 
-    - name: Set reusable strings
-      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
-      id: strings
-      shell: bash
-      run: |
-        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+      - name: Set reusable strings
+        id: strings
+        shell: bash
+        run: |
+          echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
           
-    # - name: Clone Playerbot Module
-    #   run: git clone --depth=1 --branch=master https://github.com/liyunfan1223/mod-playerbots.git modules/mod-playerbots
+      - name: Checkout Playerbot Module
+        uses: actions/checkout@v3
+        with:
+          repository: 'liyunfan1223/mod-playerbots'
+          path: 'modules/mod-playerbots'
       
-    - name: Checkout Playerbot Module
-      uses: actions/checkout@v3
-      with:
-        repository: 'liyunfan1223/mod-playerbots'
-        path: 'modules/mod-playerbots'
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            /var/cache/apt
+            /var/lib/apt
+          key: ccache:${{ matrix.os }}:${{ github.ref }}:${{ github.sha }}
+          restore-keys: |
+            ccache:${{ matrix.os }}:${{ github.ref }}
+            ccache:${{ matrix.os }}
 
-    - name: Install Requirements
-      run: sudo apt-get update && sudo apt-get install git cmake make gcc g++ clang libmysqlclient-dev libssl-dev libbz2-dev libreadline-dev libncurses-dev mysql-server libboost-all-dev
+      - name: Install Requirements
+        run: sudo apt-get update && sudo apt-get install git cmake make gcc g++ clang libmysqlclient-dev libssl-dev libbz2-dev libreadline-dev libncurses-dev mysql-server libboost-all-dev
 
-    # - name: Cache
-    #   uses: actions/cache@v3
-    #   with:
-    #     path: var/ccache
-    #     key: ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}:${{ github.sha }}
-    #     restore-keys: |
-    #       ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}
-    #       ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules
+      - name: Configure CMake
+        run: >
+          cmake -B ${{ steps.strings.outputs.build-output-dir }}
+          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+          -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          -S ${{ github.workspace }}
 
-    # - name: Configure OS
-    #   run: source ./acore.sh install-deps
-    #   env:
-    #     CONTINUOUS_INTEGRATION: true
-        
-    # - name: Create conf/config.sh
-    #   run: source ./apps/ci/ci-conf-core.sh
-      
-    # - name: Process pending sql
-    #   run: bash bin/acore-db-pendings
-      
-    # - name: Build
-    #   run: source ./apps/ci/ci-compile.sh
-        
-    - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: >
-        cmake -B ${{ steps.strings.outputs.build-output-dir }}
-        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-        -S ${{ github.workspace }}
-
-    - name: Build
-      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
-      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
-
-    # - name: Test
-    #   working-directory: ${{ steps.strings.outputs.build-output-dir }}
-    #   # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
-    #   # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-    #   run: ctest --build-config ${{ matrix.build_type }}
+      - name: Build
+        run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}

.github/workflows/macos_build.yml

@@ -5,9 +5,9 @@ on:
   pull_request:
     branches: [ "master" ]
 
-concurrency:
-  group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
-  cancel-in-progress: true
+# concurrency:
+#   group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
+#   cancel-in-progress: true
 
 jobs:
   macos-build:

.github/workflows/windows_build.yml

@@ -26,8 +26,14 @@ jobs:
         with:
           repository: 'liyunfan1223/mod-playerbots'
           path: 'modules/mod-playerbots'
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.9
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: C:\ProgramData\chocolatey\cache
+          key: ccache:${{ matrix.os }}:${{ github.ref }}:${{ github.sha }}
+          restore-keys: |
+            ccache:${{ matrix.os }}:${{ github.ref }}
+            ccache:${{ matrix.os }}
       - name: Configure OS
         shell: bash
         env:

src/PlayerbotFactory.cpp

@@ -376,7 +376,7 @@ void PlayerbotFactory::Randomize(bool incremental)
     if (bot->getLevel() >= 10)
     {
         pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Pet");
-        LOG_INFO("playerbots", "Initializing pet...");
+        LOG_DEBUG("playerbots", "Initializing pet...");
         InitPet();
         bot->SaveToDB(false, false);
         InitPetTalents();
@@ -733,7 +733,7 @@ void PlayerbotFactory::InitPet()
     {
         LOG_ERROR("playerbots", "Cannot create pet for bot {}", bot->GetName().c_str());
         return;
-}
+    }
 
     // LOG_INFO("playerbots", "Start make spell auto cast for {} spells. {} already auto casted.", pet->m_spells.size(), pet->GetPetAutoSpellSize());
     for (PetSpellMap::const_iterator itr = pet->m_spells.begin(); itr != pet->m_spells.end(); ++itr)

src/strategy/raids/naxxramas/RaidNaxxBossHelper.h

@@ -76,7 +76,7 @@ class KelthuzadBossHelper: public GenericBossHelper<Kelthuzad::boss_kelthuzad::b
         const std::pair<float, float> tank_pos = {3709.19f, -5104.86f};
         const std::pair<float, float> assist_tank_pos = {3746.05f, -5112.74f};
         bool IsPhaseOne() {
-            return _event_map->GetNextEventTime(Kelthuzad::KELTHUZAD_EVENT_PHASE_2) != 0;
+            return _event_map->GetNextEventTime(Kelthuzad::EVENT_PHASE_2) != 0;
         }
         bool IsPhaseTwo() {
             return !IsPhaseOne();
@@ -186,7 +186,7 @@ class GluthBossHelper: public GenericBossHelper<Gluth::boss_gluth::boss_gluthAI>
         const float decimatedZombiePct = 10.0f;
         GluthBossHelper(PlayerbotAI *botAI): GenericBossHelper(botAI, "gluth") {}
         bool BeforeDecimate() {
-            uint32 decimate = _event_map->GetNextEventTime(Gluth::GLUTH_EVENT_DECIMATE);
+            uint32 decimate = _event_map->GetNextEventTime(Gluth::EVENT_DECIMATE);
             return decimate && decimate - _timer <= 3000;
         }
         bool JustStartCombat() {