pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 11:48:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into eqstream

Browse Source
This commit is contained in:
KimLS
2017-03-12 18:39:15 -07:00
parent 310d27c0bd bd364a4049
commit 159706efa9
15 changed files with 315 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/special_attacks.cpp
+16 -1
View File
@@ -227,8 +227,23 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk)
if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF2 && ca_atk->m_skill == EQEmu::skills::SkillTigerClaw)
timer = pTimerCombatAbility2;
bool CanBypassSkillCheck = false;
if (ca_atk->m_skill == EQEmu::skills::SkillBash) { // SLAM - Bash without a shield equipped
switch (GetRace())
{
case OGRE:
case TROLL:
case BARBARIAN:
CanBypassSkillCheck = true;
default:
break;
}
}
/* Check to see if actually have skill */
if (!MaxSkill(static_cast<EQEmu::skills::SkillType>(ca_atk->m_skill)))
if (!MaxSkill(static_cast<EQEmu::skills::SkillType>(ca_atk->m_skill)) && !CanBypassSkillCheck)
return;
if (GetTarget()->GetID() != ca_atk->m_target)