Skip to content

Commit 650389e

Browse files
trickerertrickerer
committed
Merge branch '3.3.5' into npcbots_3.3.5
# Conflicts: # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Entities/Unit/Unit.cpp # src/server/game/Entities/Vehicle/Vehicle.cpp # src/server/game/Spells/Spell.cpp # src/server/scripts/Spells/spell_druid.cpp # src/server/scripts/Spells/spell_generic.cpp # src/server/scripts/Spells/spell_paladin.cpp # src/server/scripts/Spells/spell_priest.cpp # src/server/scripts/Spells/spell_rogue.cpp
2 parents f93a683 + fc735e3 commit 650389e

File tree

389 files changed

+3025
-2486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+3025
-2486
lines changed

‎.github/workflows/codestyle.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ jobs:
1313
if: github.repository == 'azerothcore/azerothcore-wotlk'
1414
steps:
1515
- uses: actions/checkout@v4
16+
- name: Setup python
17+
uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.10'
1620
- name: AzerothCore codestyle
17-
run: source ./apps/ci/ci-codestyle.sh
21+
run: python ./apps/codestyle/codestyle.py
1822
- name: C++ Advanced
1923
run: |
2024
sudo apt update -y

‎apps/ci/ci-codestyle.sh

-40
This file was deleted.

‎apps/codestyle/codestyle.py

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
import io
2+
import os
3+
import sys
4+
5+
# Get the src directory of the project
6+
src_directory = os.path.join(os.getcwd(), 'src')
7+
8+
# Global variables
9+
error_handler = False
10+
results = {
11+
"Multiple blank lines check": "Passed",
12+
"Trailing whitespace check": "Passed",
13+
"GetCounter() check": "Passed",
14+
"GetTypeId() check": "Passed",
15+
"NpcFlagHelpers check": "Passed"
16+
}
17+
18+
# Main function to parse all the files of the project
19+
def parsing_file(directory: str) -> None:
20+
for root, _, files in os.walk(directory):
21+
for file in files:
22+
if not file.endswith('.ico'): # Skip .ico files that cannot be read
23+
file_path = os.path.join(root, file)
24+
file_name = file
25+
try:
26+
with open(file_path, 'r', encoding='utf-8') as file:
27+
multiple_blank_lines_check(file, file_path)
28+
trailing_whitespace_check(file, file_path)
29+
get_counter_check(file, file_path)
30+
if file_name != 'Object.h':
31+
get_typeid_check(file, file_path)
32+
if file_name != 'Unit.h':
33+
npcflags_helpers_check(file, file_path)
34+
except UnicodeDecodeError:
35+
print(f"\nCould not decode file {file_path}")
36+
sys.exit(1)
37+
# Output the results
38+
print("")
39+
for check, result in results.items():
40+
print(f"{check} : {result}")
41+
if error_handler:
42+
print("\nPlease fix the codestyle issues above.")
43+
sys.exit(1)
44+
else:
45+
print(f"\nEverything looks good")
46+
47+
# Codestyle patterns checking for multiple blank lines
48+
def multiple_blank_lines_check(file: io, file_path: str) -> None:
49+
global error_handler, results
50+
file.seek(0) # Reset file pointer to the beginning
51+
check_failed = False
52+
consecutive_blank_lines = 0
53+
# Parse all the file
54+
for line_number, line in enumerate(file, start = 1):
55+
if line.strip() == '':
56+
consecutive_blank_lines += 1
57+
if consecutive_blank_lines > 1:
58+
print(f"Multiple blank lines found in {file_path} at line {line_number - 1}")
59+
check_failed = True
60+
else:
61+
consecutive_blank_lines = 0
62+
# Additional check for the end of the file
63+
if consecutive_blank_lines >= 1:
64+
print(f"Multiple blank lines found at the end of: {file_path}")
65+
check_failed = True
66+
# Handle the script error and update the result output
67+
if check_failed:
68+
error_handler = True
69+
results["Multiple blank lines check"] = "Failed"
70+
71+
# Codestyle patterns checking for whitespace at the end of the lines
72+
def trailing_whitespace_check(file: io, file_path: str) -> None:
73+
global error_handler, results
74+
file.seek(0) # Reset file pointer to the beginning
75+
# Parse all the file
76+
for line_number, line in enumerate(file, start = 1):
77+
if line.endswith(' \n'):
78+
print(f"Trailing whitespace found: {file_path} at line {line_number}")
79+
if not error_handler:
80+
error_handler = True
81+
results["Trailing whitespace check"] = "Failed"
82+
83+
# Codestyle patterns checking for ObjectGuid::GetCounter()
84+
def get_counter_check(file: io, file_path: str) -> None:
85+
global error_handler, results
86+
file.seek(0) # Reset file pointer to the beginning
87+
# Parse all the file
88+
for line_number, line in enumerate(file, start = 1):
89+
if 'ObjectGuid::GetCounter()' in line:
90+
print(f"Please use ObjectGuid::ToString().c_str() instead ObjectGuid::GetCounter(): {file_path} at line {line_number}")
91+
if not error_handler:
92+
error_handler = True
93+
results["GetCounter() check"] = "Failed"
94+
95+
# Codestyle patterns checking for GetTypeId()
96+
def get_typeid_check(file: io, file_path: str) -> None:
97+
global error_handler, results
98+
file.seek(0) # Reset file pointer to the beginning
99+
check_failed = False
100+
# Parse all the file
101+
for line_number, line in enumerate(file, start = 1):
102+
if 'GetTypeId() == TYPEID_PLAYER' in line:
103+
print(f"Please use IsPlayer() instead GetTypeId(): {file_path} at line {line_number}")
104+
check_failed = True
105+
if 'GetTypeId() == TYPEID_ITEM' in line:
106+
print(f"Please use IsItem() instead GetTypeId(): {file_path} at line {line_number}")
107+
check_failed = True
108+
if 'GetTypeId() == TYPEID_DYNOBJECT' in line:
109+
print(f"Please use IsDynamicObject() instead GetTypeId(): {file_path} at line {line_number}")
110+
check_failed = True
111+
# Handle the script error and update the result output
112+
if check_failed:
113+
error_handler = True
114+
results["GetTypeId() check"] = "Failed"
115+
116+
# Codestyle patterns checking for NpcFlag helpers
117+
def npcflags_helpers_check(file: io, file_path: str) -> None:
118+
global error_handler, results
119+
file.seek(0) # Reset file pointer to the beginning
120+
check_failed = False
121+
# Parse all the file
122+
for line_number, line in enumerate(file, start = 1):
123+
if 'GetUInt32Value(UNIT_NPC_FLAGS)' in line:
124+
print(
125+
f"Please use GetNpcFlags() instead GetUInt32Value(UNIT_NPC_FLAGS): {file_path} at line {line_number}")
126+
check_failed = True
127+
if 'HasFlag(UNIT_NPC_FLAGS,' in line:
128+
print(
129+
f"Please use HasNpcFlag() instead HasFlag(UNIT_NPC_FLAGS, ...): {file_path} at line {line_number}")
130+
check_failed = True
131+
if 'SetUInt32Value(UNIT_NPC_FLAGS,' in line:
132+
print(
133+
f"Please use ReplaceAllNpcFlags() instead SetUInt32Value(UNIT_NPC_FLAGS, ...): {file_path} at line {line_number}")
134+
check_failed = True
135+
if 'SetFlag(UNIT_NPC_FLAGS,' in line:
136+
print(
137+
f"Please use SetNpcFlag() instead SetFlag(UNIT_NPC_FLAGS, ...): {file_path} at line {line_number}")
138+
check_failed = True
139+
if 'RemoveFlag(UNIT_NPC_FLAGS,' in line:
140+
print(
141+
f"Please use RemoveNpcFlag() instead RemoveFlag(UNIT_NPC_FLAGS, ...): {file_path} at line {line_number}")
142+
# Handle the script error and update the result output
143+
if check_failed:
144+
error_handler = True
145+
results["NpcFlagHelpers check"] = "Failed"
146+
147+
# Main function
148+
parsing_file(src_directory)

‎apps/installer/includes/os_configs/debian.sh

+18-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,27 @@ if ! command -v lsb_release &>/dev/null ; then
33
fi
44

55
DEBIAN_VERSION=$(lsb_release -sr)
6+
DEBIAN_VERSION_MIN="12"
7+
8+
if [[ $DEBIAN_VERSION -lt $DEBIAN_VERSION_MIN ]]; then
9+
echo "########## ########## ##########"
10+
echo ""
11+
echo " using unsupported Debian version" $DEBIAN_VERSION
12+
echo " please update to Debian" $DEBIAN_VERSION_MIN "or later"
13+
echo ""
14+
echo "########## ########## ##########"
15+
fi
616

717
sudo apt-get update -y
818

919
sudo apt-get install -y gdbserver gdb unzip curl \
1020
libncurses-dev libreadline-dev clang g++ \
11-
gcc git cmake make ccache
21+
gcc git cmake make ccache \
22+
default-libmysqlclient-dev libssl-dev libbz2-dev \
23+
libboost-all-dev gnupg wget
1224

13-
if [[ $DEBIAN_VERSION -eq "10" ]]; then
14-
sudo apt-get install -y default-libmysqlclient-dev libssl-dev libreadline-dev libncurses-dev mariadb-server
15-
libboost-system1.6*-dev libboost-filesystem1.6*-dev libboost-program-options1.6*-dev libboost-iostreams1.6*-dev \
16-
else # Debian 8 and 9 should work using this
17-
sudo apt-get install -y libmysqlclient-dev libssl1.0-dev mysql-server
18-
fi
25+
# run noninteractive install for MYSQL 8.4 LTS
26+
wget https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb
27+
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i ./mysql-apt-config_0.8.32-1_all.deb
28+
sudo apt-get update
29+
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server

‎apps/installer/includes/os_configs/ubuntu.sh

+28-13
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,41 @@ fi
44

55
UBUNTU_VERSION=$(lsb_release -sr);
66

7+
case $UBUNTU_VERSION in
8+
"22.04")
9+
;;
10+
"24.04")
11+
;;
12+
*)
13+
echo "########## ########## ##########"
14+
echo ""
15+
echo " using unsupported Ubuntu version " $UBUNTU_VERSION
16+
echo " please update to Ubuntu 22.04 or later"
17+
echo ""
18+
echo "########## ########## ##########"
19+
;;
20+
esac
21+
722
sudo apt update
823

924
# shared deps
10-
sudo apt-get -y install ccache clang cmake curl google-perftools libmysqlclient-dev make unzip
25+
sudo DEBIAN_FRONTEND="noninteractive" \
26+
apt-get -y install ccache clang cmake curl google-perftools libmysqlclient-dev make unzip
1127

1228
if [[ $CONTINUOUS_INTEGRATION || $DOCKER ]]; then
29+
# TODO: update CI / Docker section for Ubuntu 22.04+
1330
sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt-get -y install build-essential cmake-data \
1431
libboost1.74-dev libbz2-dev libncurses5-dev libmysql++-dev libgoogle-perftools-dev libreadline6-dev libssl-dev libtool \
1532
openssl zlib1g-dev
1633
else
17-
case $UBUNTU_VERSION in
18-
"20.04")
19-
sudo apt-get install -y g++ gdb gdbserver gcc git \
20-
libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
21-
libssl-dev mysql-server
22-
;;
23-
*)
24-
sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt-get install -y g++ gdb gdbserver gcc git \
25-
libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
26-
libssl-dev mysql-server
27-
;;
28-
esac
34+
sudo DEBIAN_FRONTEND="noninteractive" \
35+
apt-get install -y g++ gdb gdbserver gcc git \
36+
libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
37+
libssl-dev
38+
39+
# run noninteractive install for MYSQL 8.4 LTS
40+
wget https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb
41+
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i ./mysql-apt-config_0.8.32-1_all.deb
42+
sudo apt-get update
43+
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server
2944
fi

‎data/sql/updates/db_world/2024_08_25_00.sql

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-- DB update 2024_08_22_01 -> 2024_08_25_00
2+
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=23569;
3+
DELETE FROM `smart_scripts` WHERE `entryorguid`=23569 AND `source_type`=0;
4+
DELETE FROM `smart_scripts` WHERE `entryorguid`=2356900 AND `source_type`=9;
5+
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
6+
(23569,0,0,1,62,0,100,0,8837,0,0,0,134,42670,0,0,0,0,0,7,0,0,0,0,0,0,0,'Renn McGill - On Gossip Option 0 Selected - Invoker Cast \'Replace Repaired Diving Gear\''),
7+
(23569,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Renn McGill - On Gossip Option 0 Selected - Close Gossip'),
8+
(23569,0,2,0,20,0,100,0,11140,0,0,0,80,2356900,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Quest \'Recover the Cargo!\' Finished - Run Script'),
9+
(2356900,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Remove Npc Flag Questgiver+Gossip'),
10+
(2356900,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Say Line 0'),
11+
(2356900,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Say Line 1'),
12+
(2356900,9,3,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Say Line 2'),
13+
(2356900,9,4,0,0,0,100,0,6000,6000,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Add Npc Flag Questgiver+Gossip');

‎data/sql/updates/db_world/2024_08_26_00.sql

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- DB update 2024_08_25_00 -> 2024_08_26_00
2+
-- Fix the target_type for Chain lightning and Psychic Scream spells with Twilight Prophet
3+
SET @ENTRY := 15308;
4+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0) AND (`entryorguid` = @ENTRY);
5+
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
6+
(@ENTRY, 0, 0, 0, 0, 0, 100, 0, 4000, 4500, 12000, 15000, 0, 0, 11, 15305, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Prophet - In Combat - Cast Chain Lightning'),
7+
(@ENTRY, 0, 1, 0, 0, 0, 100, 0, 8000, 9000, 25000, 28000, 0, 0, 11, 22884, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Prophet - In Combat - Cast Psychic Scream'),
8+
(@ENTRY, 0, 2, 0, 106, 0, 100, 0, 16000, 19000, 16000, 19000, 0, 8, 11, 17366, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Prophet - Within 0-8 Range - Cast Fire Nova'),
9+
(@ENTRY, 0, 3, 0, 106, 0, 100, 0, 16000, 19000, 16000, 19000, 0, 8, 11, 15531, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Prophet - Within 0-8 Range - Cast Frost Nova');

‎data/sql/updates/db_world/2024_08_26_01.sql

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-- DB update 2024_08_26_00 -> 2024_08_26_01
2+
--
3+
DELETE FROM `spell_script_names` WHERE `spell_id` = 41360;
4+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
5+
(41360, 'spell_black_temple_l5_arcane_charge');

0 commit comments

Comments
 (0)