diff options
| -rw-r--r-- | src/game/Level1.cpp | 2 | ||||
| -rw-r--r-- | src/game/ObjectMgr.h | 2 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 17 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 88d65f783fa..0317a6c3e22 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -370,7 +370,7 @@ bool ChatHandler::HandleGMTicketGetByIdCommand(const char* args) uint64 tguid = atoi(args); GM_Ticket *ticket = objmgr.GetGMTicket(tguid); - if(!ticket) + if(!ticket || ticket->closed != 0) { SendSysMessage(LANG_COMMAND_TICKETNOTEXIST); return true; diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index f5189116463..037ba4a78f2 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -845,7 +845,7 @@ class ObjectMgr GM_Ticket *GetGMTicket(uint64 ticketGuid) { for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i) - if((*i) && (*i)->guid == ticketGuid && (*i)->closed == 0) + if((*i) && (*i)->guid == ticketGuid) return (*i); return NULL; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5f08895cf87..d5c4f0db0e1 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6499,20 +6499,21 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger int32 extra_attack_power = CalculateSpellDamage(windfurySpellEntry, 1, windfurySpellEntry->EffectBasePoints[1], pVictim); - // Off-Hand case - if ( castItem->GetSlot() == EQUIPMENT_SLOT_OFFHAND && isAttackReady(OFF_ATTACK) ) - { - // Value gained from additional AP - basepoints0 = int32(extra_attack_power/14.0f * GetAttackTime(OFF_ATTACK)/1000/2); - triggered_spell_id = 33750; - } // Main-Hand case - else if ( isAttackReady(BASE_ATTACK) ) + if ( castItem->GetSlot() == EQUIPMENT_SLOT_MAINHAND && isAttackReady(BASE_ATTACK) ) { // Value gained from additional AP basepoints0 = int32(extra_attack_power/14.0f * GetAttackTime(BASE_ATTACK)/1000); triggered_spell_id = 25504; } + // Off-Hand case + else if ( castItem->GetSlot() == EQUIPMENT_SLOT_OFFHAND && isAttackReady(OFF_ATTACK) ) + { + // Value gained from additional AP + basepoints0 = int32(extra_attack_power/14.0f * GetAttackTime(OFF_ATTACK)/1000/2); + triggered_spell_id = 33750; + } + else return false; |