public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core): CanAccountCreateCharacter hook parameters (#13060)

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-09-21 05:42:56 -06:00
committed by GitHub
parent 9819b2d700
commit d9390e34b4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Handlers/CharacterHandler.cpp
View File

@@ -432,7 +432,7 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket& recvData)
std::function<void(PreparedQueryResult)> finalizeCharacterCreation = [this, createInfo](PreparedQueryResult result) std::function<void(PreparedQueryResult)> finalizeCharacterCreation = [this, createInfo](PreparedQueryResult result)
{ {
if (!sScriptMgr->CanAccountCreateCharacter(createInfo, GetAccountId())) if (!sScriptMgr->CanAccountCreateCharacter(GetAccountId(), createInfo->Race, createInfo->Class))
{ {
SendCharCreate(CHAR_CREATE_DISABLED); SendCharCreate(CHAR_CREATE_DISABLED);
return; return;

4
src/server/game/Scripting/ScriptDefines/AccountScript.cpp
View File

@@ -82,11 +82,11 @@ void ScriptMgr::OnFailedPasswordChange(uint32 accountId)
}); });
} }
bool ScriptMgr::CanAccountCreateCharacter(std::shared_ptr<CharacterCreateInfo> createInfo, uint32 accountId) bool ScriptMgr::CanAccountCreateCharacter(uint32 accountId, uint8 charRace, uint8 charClass)
{ {
auto ret = IsValidBoolScript<AccountScript>([&](AccountScript* script) auto ret = IsValidBoolScript<AccountScript>([&](AccountScript* script)
{ {
return !script->CanAccountCreateCharacter(createInfo, accountId); return !script->CanAccountCreateCharacter(accountId, charRace, charClass);
}); });
if (ret && *ret) if (ret && *ret)

4
src/server/game/Scripting/ScriptMgr.h
View File

@@ -1461,7 +1461,7 @@ public:
virtual void OnFailedPasswordChange(uint32 /*accountId*/) { } virtual void OnFailedPasswordChange(uint32 /*accountId*/) { }
// Called when creating a character on the Account // Called when creating a character on the Account
[[nodiscard]] virtual bool CanAccountCreateCharacter(std::shared_ptr<CharacterCreateInfo> /*createInfo*/, uint32 /*accountId*/) { return true;} [[nodiscard]] virtual bool CanAccountCreateCharacter(uint32 /*accountId*/, uint8 /*charRace*/, uint8 /*charClass*/) { return true;}
}; };
class GuildScript : public ScriptObject class GuildScript : public ScriptObject
@@ -2360,7 +2360,7 @@ public: /* AccountScript */
void OnFailedEmailChange(uint32 accountId); void OnFailedEmailChange(uint32 accountId);
void OnPasswordChange(uint32 accountId); void OnPasswordChange(uint32 accountId);
void OnFailedPasswordChange(uint32 accountId); void OnFailedPasswordChange(uint32 accountId);
bool CanAccountCreateCharacter(std::shared_ptr<CharacterCreateInfo> createInfo, uint32 accountId); bool CanAccountCreateCharacter(uint32 accountId, uint8 charRace, uint8 charClass);
public: /* GuildScript */ public: /* GuildScript */
void OnGuildAddMember(Guild* guild, Player* player, uint8& plRank); void OnGuildAddMember(Guild* guild, Player* player, uint8& plRank);