Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4
Conflicts: README.md sql/updates/world/2015_02_06_13_world_335.sql src/server/game/Globals/ObjectMgr.cpp src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
commit
7d5d040948
25 files changed
+467
-391
No files matched your search
@@ -1856,7 +1856,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const*
|
||||
return ERR_BATTLEGROUND_NONE; // ERR_GROUP_JOIN_BATTLEGROUND_TOO_MANY handled on client side
|
||||
|
||||
// get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.)
|
||||
Player* reference = GetFirstMember()->GetSource();
|
||||
Player* reference = ASSERT_NOTNULL(GetFirstMember())->GetSource();
|
||||
// no reference found, can't join this way
|
||||
if (!reference)
|
||||
return ERR_BATTLEGROUND_JOIN_FAILED;
|
||||
|
||||
Reference in new issue
Block a user