josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spell Mechanics: remove redundant call to AddGlobalCooldown left from previous GCD checks implementation (thanks Machiavelli for spotting)

Browse Source 
Core/Logs: fix one more log message for Aokromes
This commit is contained in:
Azazel
2011-02-22 23:20:21 +06:00
parent 09bac61e42
commit 6a4fd1c780
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/Protocol/Handlers/PetHandler.cpp
+2 -1
View File
@@ -141,7 +141,8 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
CharmInfo *charmInfo = pet->GetCharmInfo(); CharmInfo *charmInfo = pet->GetCharmInfo();
if (!charmInfo) if (!charmInfo)
{ {
sLog->outError("WorldSession::HandlePetAction: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId()); sLog->outError("WorldSession::HandlePetAction(petGuid: " UI64FMTD ", tagGuid: " UI64FMTD ", spellId: %u, flag: %u): object (entry: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!",
guid1, guid2, spellid, flag, pet->GetGUIDLow(), pet->GetTypeId());
return; return;
} }
src/server/game/Spells/Spell.cpp
+3 -4
View File
@@ -3003,9 +3003,6 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const * triggere
TriggerGlobalCooldown(); TriggerGlobalCooldown();
if (m_caster->GetTypeId() == TYPEID_PLAYER)
m_caster->ToPlayer()->AddGlobalCooldown(m_spellInfo,this);
if (!m_casttime && !m_spellInfo->StartRecoveryTime if (!m_casttime && !m_spellInfo->StartRecoveryTime
&& !m_castItemGUID //item: first cast may destroy item and second cast causes crash && !m_castItemGUID //item: first cast may destroy item and second cast causes crash
&& GetCurrentContainer() == CURRENT_GENERIC_SPELL) && GetCurrentContainer() == CURRENT_GENERIC_SPELL)
@@ -7293,7 +7290,9 @@ void Spell::CallScriptAfterUnitTargetSelectHandlers(std::list<Unit*>& unitTarget
} }
} }
enum eGCD { // Global cooldowns management
enum GCDLimits
{
MIN_GCD = 1000, MIN_GCD = 1000,
MAX_GCD = 1500 MAX_GCD = 1500
}; };