From e1f069e5b9ab90a967811dc9e3a1a0e266f9cebd Mon Sep 17 00:00:00 2001 From: Triply Date: Thu, 12 Mar 2009 16:28:14 +0100 Subject: [PATCH] [7448] Fixed infinite honor gains in EoS. Problem reported by LickedLurk. Thx. Fixed Entering battleground bugged in [7447] Signed-off-by: Triply --- src/game/BattleGroundEY.cpp | 2 +- src/game/BattleGroundHandler.cpp | 5 ++++- src/shared/revision_nr.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp index ca3deb465..aefaf57c8 100644 --- a/src/game/BattleGroundEY.cpp +++ b/src/game/BattleGroundEY.cpp @@ -520,7 +520,7 @@ void BattleGroundEY::Reset() m_PointAddingTimer = 0; m_TowerCapCheckTimer = 0; bool isBGWeekend = false; //TODO FIXME - call sBattleGroundMgr.IsBGWeekend(m_TypeID); - you must also implement that call! - uint32 m_HonorTics = (isBGWeekend) ? BG_EY_EYWeekendHonorTicks : BG_EY_NotEYWeekendHonorTicks; + m_HonorTics = (isBGWeekend) ? BG_EY_EYWeekendHonorTicks : BG_EY_NotEYWeekendHonorTicks; for(uint8 i = 0; i < EY_POINTS_MAX; ++i) { diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 4c457b38a..dee75a983 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -401,12 +401,15 @@ void WorldSession::HandleBattleGroundPlayerPortOpcode( WorldPacket &recv_data ) WorldPacket data2(SMSG_GROUP_JOINED_BATTLEGROUND, 4); data2 << uint32(0xFFFFFFFE); _player->GetSession()->SendPacket(&data2); + action = 0; sLog.outDebug("Battleground: player %s (%u) has a deserter debuff, do not port him to battleground!", _player->GetName(), _player->GetGUIDLow()); } //if player don't match battleground max level, then do not allow him to enter! (this might happen when player leveled up during his waiting in queue if( _player->getLevel() > bg->GetMaxLevel() ) + { sLog.outError("Battleground: Player %s (%u) has level higher than maxlevel of battleground! Do not port him to battleground!", _player->GetName(), _player->GetGUIDLow()); - action = 0; + action = 0; + } } uint32 queueSlot = _player->GetBattleGroundQueueIndex(bgQueueTypeId); WorldPacket data; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6a4325192..eed557192 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 "7447" + #define REVISION_NR "7448" #endif // __REVISION_NR_H__