diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp index 17bf3d7a9..160796925 100644 --- a/src/game/BattleGroundAV.cpp +++ b/src/game/BattleGroundAV.cpp @@ -737,7 +737,8 @@ void BattleGroundAV::AssaultNode(BG_AV_Nodes node, uint32 team) assert(team < 3); // alliance:0, horde:1, neutral:2 assert(m_Nodes[node].TotalOwner != team); assert(m_Nodes[node].Owner != team); - assert(m_Nodes[node].State != POINT_ASSAULTED || !m_Nodes[node].TotalOwner ); // only assault an assaulted node if no totalowner exists + // only assault an assaulted node if no totalowner exists: + assert(m_Nodes[node].State != POINT_ASSAULTED || m_Nodes[node].TotalOwner == BG_AV_NEUTRAL_TEAM); // the timer gets another time, if the previous owner was 0 == Neutral m_Nodes[node].Timer = (m_Nodes[node].PrevOwner != BG_AV_NEUTRAL_TEAM) ? BG_AV_CAPTIME : BG_AV_SNOWFALL_FIRSTCAP; m_Nodes[node].PrevOwner = m_Nodes[node].Owner; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8a14f89ee..168576ebd 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8614" + #define REVISION_NR "8615" #endif // __REVISION_NR_H__