From 2d80b547fc8d0ca2eb8fcdb2d2932aff91bab970 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 2 Jun 2011 17:28:30 +0200
Subject: [PATCH] Changed: Merge changes from next patch

---
 .../src/entities_game_service/player_manager/character.cpp      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
index 193c36681..586c21d82 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
@@ -18084,7 +18084,7 @@ void CCharacter::resetTpTicketSlot()
 //----------------------------------------------------------------------------
 void CCharacter::updateParry(ITEMFAMILY::EItemFamily family, SKILLS::ESkills skill)
 {
-	if (family == ITEMFAMILY::MELEE_WEAPON && skill < SKILLS::NUM_SKILLS)
+	if ((family == ITEMFAMILY::MELEE_WEAPON || family == ITEMFAMILY::RANGE_WEAPON)  && skill < SKILLS::NUM_SKILLS)
 		_CurrentParrySkill = skill;
 	else
 		_CurrentParrySkill = BarehandCombatSkill;