nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-25 22:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source 
# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Entities/Unit/Unit.h
This commit is contained in:
郑佩茹
2022-08-16 16:13:26 -06:00
parent 29e14042e7 b2e449fd15
commit 32c6babdb7
159 changed files with 5246 additions and 2794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/GameObject/GameObject.h
View File

@@ -1061,6 +1061,8 @@ public:
void UpdateSaveToDb(bool enable);
void SavingStateOnDB();
std::string GetDebugInfo() const override;
protected:
bool AIM_Initialize();
GameObjectModel* CreateModel();