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

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-09-22 15:18:27 -06:00
committed by GitHub
parent 8da3ae8a91 23f432c6b5
commit 4c6c80d880
20 changed files with 6130 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
View File

@@ -153,6 +153,22 @@ bool SummonList::IsAnyCreatureAlive() const
return false;
}
bool SummonList::IsAnyCreatureWithEntryAlive(uint32 entry) const
{
for (auto const& guid : storage_)
{
if (Creature* summon = ObjectAccessor::GetCreature(*me, guid))
{
if (summon->GetEntry() == entry && summon->IsAlive())
{
return true;
}
}
}
return false;
}
bool SummonList::IsAnyCreatureInCombat() const
{
for (auto const& guid : storage_)

1
src/server/game/AI/ScriptedAI/ScriptedCreature.h
View File

@@ -91,6 +91,7 @@ public:
void DespawnEntry(uint32 entry);
void DespawnAll();
bool IsAnyCreatureAlive() const;
bool IsAnyCreatureWithEntryAlive(uint32 entry) const;
bool IsAnyCreatureInCombat() const;
template <typename T>

5
src/server/game/Groups/Group.cpp
View File

@@ -1986,6 +1986,11 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const*
// don't let Death Knights join BG queues when they are not allowed to be teleported yet
if (member->getClass() == CLASS_DEATH_KNIGHT && member->GetMapId() == 609 && !member->IsGameMaster() && !member->HasSpell(50977))
return ERR_GROUP_JOIN_BATTLEGROUND_FAIL;
if (!member->GetBGAccessByLevel(bgTemplate->GetBgTypeID()))
{
return ERR_BATTLEGROUND_JOIN_TIMED_OUT;
}
}
// for arenas: check party size is proper

8
src/server/game/Handlers/BattleGroundHandler.cpp
View File

@@ -187,6 +187,10 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData)
{
err = ERR_BATTLEGROUND_NONE;
}
else if (!_player->GetBGAccessByLevel(bgTypeId))
{
err = ERR_BATTLEGROUND_NONE;
}
if (err <= 0)
{
@@ -236,6 +240,10 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData)
{
err = ERR_BATTLEGROUND_NONE;
}
else if (!member->GetBGAccessByLevel(bgTypeId))
{
err = ERR_BATTLEGROUND_JOIN_TIMED_OUT;
}
if (err < 0)
{