BETA: Core-part for ​[DP9534].

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java

@@ -38,7 +38,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.effects.L2Effect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.entity.TvTEventTeam;
 import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -868,36 +867,6 @@ public final class L2CubicInstance
 					}
 					break;
 				}
-				default:
-				{
-					if (skill.hasEffectType(L2EffectType.CANCEL_DEBUFF))
-					{
-						L2Effect[] effects = target.getAllEffects();
-						
-						if ((effects == null) || (effects.length == 0))
-						{
-							break;
-						}
-						
-						int count = (skill.getMaxNegatedEffects() > 0) ? 0 : -2;
-						for (L2Effect e : effects)
-						{
-							if (e.getSkill().isDebuff() && (count < skill.getMaxNegatedEffects()))
-							{
-								// Do not remove raid curse skills
-								if ((e.getSkill().getId() != 4215) && (e.getSkill().getId() != 4515) && (e.getSkill().getId() != 4082))
-								{
-									e.exit();
-									if (count > -1)
-									{
-										count++;
-									}
-								}
-							}
-						}
-					}
-					
-				}
 			}
 		}
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -2535,7 +2535,7 @@ public final class Formulas
 		return false;
 	}
 	
-	public static List<L2Effect> calcCancel(L2Character activeChar, L2Character target, L2Skill skill, double power)
+	public static List<L2Effect> calcCancelStealEffects(L2Character activeChar, L2Character target, L2Skill skill, double power)
 	{
 		int cancelMagicLvl = skill.getMagicLevel();
 		int count = skill.getMaxNegatedEffects();
@@ -2679,15 +2679,6 @@ public final class Formulas
 	{
 		rate *= (eff.getSkill().getMagicLevel() > 0) ? (cancelMagicLvl / eff.getSkill().getMagicLevel()) : 1;
 		
-		// Check the Rate Limits.
-		if (rate > skill.getMaxChance())
-		{
-			rate = skill.getMaxChance();
-		}
-		else if (rate < skill.getMinChance())
-		{
-			rate = skill.getMinChance();
-		}
-		return Rnd.get(100) < rate;
+		return Rnd.get(100) < Math.min(Math.max(rate, skill.getMinChance()), skill.getMaxChance());
 	}
 }