aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-05-04 15:48:10 +0200
committerQAston <none@none>2009-05-04 15:48:10 +0200
commit6bee2f988af8da474ecebe776e61768bcc730f46 (patch)
tree85e81f2950ff1ae1f151c9f9f981b8e8e6c5ebd5 /src/game/Unit.cpp
parent30ac988ad3273d38ed9b32ba80822c04f87ae696 (diff)
*Do not take ammo for shockwave
*Do not check weapon skills for hits against players' summons *Apply range mods for channeled spell range check --HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index b8d1be768d7..d05d84416ce 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3187,11 +3187,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
// feral or unarmed skill only for base attack
if(attType != BASE_ATTACK && !item )
- {
- if(attType == RANGED_ATTACK && getClass() == CLASS_PALADIN) //hammer
- return GetMaxSkillValueForLevel();
return 0;
- }
if(IsInFeralForm())
return GetMaxSkillValueForLevel(); // always maximized SKILL_FERAL_COMBAT in fact
@@ -3200,7 +3196,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
uint32 skill = item ? item->GetSkill() : SKILL_UNARMED;
// in PvP use full skill instead current skill value
- value = (target && target->GetTypeId() == TYPEID_PLAYER)
+ value = (target && target->GetTypeId() == TYPEID_PLAYER || IS_PLAYER_GUID(GetOwnerGUID()))
? ((Player*)this)->GetMaxSkillValue(skill)
: ((Player*)this)->GetSkillValue(skill);
// Modify value from ratings