BETA: Re-Added switch part for [5394].

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1868,7 +1868,20 @@ public abstract class L2Character extends L2Object
 					hitTime = (int) (0.60 * hitTime);
 					coolTime = (int) (0.60 * coolTime);
 					
-					weaponInst.setChargedSpiritshot(L2ItemInstance.CHARGED_NONE);
+					// FIXME: This should be done independently in each handler.
+					// Skills that consume SPS/BSPS without increase power.
+					switch (skill.getSkillType())
+					{
+						case DUMMY:
+						case BUFF:
+						case MANAHEAL:
+						case MANARECHARGE:
+						case MANA_BY_LEVEL:
+						case RESURRECT:
+						case RECALL:
+							weaponInst.setChargedSpiritshot(L2ItemInstance.CHARGED_NONE);
+							break;
+					}
 				}
 			}
 			

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -1065,36 +1065,6 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	
 	public int getMinPledgeClass() { return _minPledgeClass;  }
 	
-	public final boolean isPvpSkill()
-	{
-		switch (_skillType)
-		{
-			case DOT:
-			case BLEED:
-			case CONFUSION:
-			case POISON:
-			case DEBUFF:
-			case AGGDEBUFF:
-			case STUN:
-			case ROOT:
-			case FEAR:
-			case SLEEP:
-			case MDOT:
-			case MUTE:
-			case PARALYZE:
-			case CANCEL:
-			case BETRAY:
-			case DISARM:
-			case AGGDAMAGE:
-			case STEAL_BUFF:
-			case AGGREDUCE_CHAR:
-			case MANADAM:
-				return true;
-			default:
-				return false;
-		}
-	}
-	
 	public final boolean isOffensive()
 	{
 		return _isOffensive;
@@ -1188,6 +1158,36 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		return _flyCourse;
 	}
 	
+	public final boolean isPvpSkill()
+	{
+		switch (_skillType)
+		{
+			case DOT:
+			case BLEED:
+			case CONFUSION:
+			case POISON:
+			case DEBUFF:
+			case AGGDEBUFF:
+			case STUN:
+			case ROOT:
+			case FEAR:
+			case SLEEP:
+			case MDOT:
+			case MUTE:
+			case PARALYZE:
+			case CANCEL:
+			case BETRAY:
+			case DISARM:
+			case AGGDAMAGE:
+			case STEAL_BUFF:
+			case AGGREDUCE_CHAR:
+			case MANADAM:
+				return true;
+			default:
+				return false;
+		}
+	}
+	
 	public final boolean isSkillTypeOffensive()
 	{
 		switch (_skillType)
@@ -1237,7 +1237,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 			case INSTANT_JUMP:
 				return true;
 			default:
-				return this.isDebuff();
+				return false;
 		}
 	}