Some small fixes to Charm of Courage. tnx slyce

L2_GameServer_T1/java/net/sf/l2j/gameserver/handler/itemhandlers/Scrolls.java

@@ -116,12 +116,12 @@ public class Scrolls implements IItemHandler
 	   	{
 	   	    byte expIndex = (byte)activeChar.getExpertiseIndex();
             
-	   		if ((itemId == 8515 && expIndex==0) || // Charm of Courage (No Grade)
-			    (itemId == 8516 && expIndex==1) || // Charm of Courage (D Grade)
-       	        (itemId == 8517 && expIndex==2) || // Charm of Courage (C Grade)
-       	        (itemId == 8518 && expIndex==3) || // Charm of Courage (B Grade)
-       	        (itemId == 8519 && expIndex==4) || // Charm of Courage (A Grade)
-       	        (itemId == 8520 && (expIndex==5 || expIndex==6))) // Charm of Courage (S Grade)
+	   		if ((itemId == 8515 && expIndex == 0) || // Charm of Courage (No Grade)
+			    (itemId == 8516 && expIndex <= 1) || // Charm of Courage (D Grade)
+       	        (itemId == 8517 && expIndex <= 2) || // Charm of Courage (C Grade)
+       	        (itemId == 8518 && expIndex <= 3) || // Charm of Courage (B Grade)
+       	        (itemId == 8519 && expIndex <= 4) || // Charm of Courage (A Grade)
+       	        (itemId == 8520 && expIndex <= 6)) // Charm of Courage (S Grade)
        	  	{
 	   			if (!playable.destroyItem("Consume", item.getObjectId(), 1, null, false))
 	   				return;

L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java

@@ -5017,8 +5017,6 @@ public final class L2PcInstance extends L2PlayableInstance
 		    	lostExp = 0;
 		}
 
-		setCharmOfCourage(false);
-
         if (Config.DEBUG)
             _log.fine(getName() + " died and lost " + lostExp + " experience.");