Fixed cancellation not removing dances.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF:

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/CharEffectList.java

@@ -140,6 +140,15 @@ public final class CharEffectList
 		return _actives.stream().filter(b -> b.getSkill().getBuffType().isBuff()).collect(Collectors.toList());
 	}
 	
+	/**
+	 * Gets all the active positive effects on this effect list.
+	 * @return all the dances songs on this effect list
+	 */
+	public List<BuffInfo> getDances()
+	{
+		return _actives.stream().filter(b -> b.getSkill().getBuffType().isDance()).collect(Collectors.toList());
+	}
+	
 	/**
 	 * Gets all the active negative effects on this effect list.
 	 * @return all the debuffs on this effect list

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1059,8 +1059,25 @@ public final class Formulas
 				final int cancelMagicLvl = skill.getMagicLevel();
 				
 				// Prevent initialization.
-				final List<BuffInfo> buffs = target.getEffectList().getBuffs();
+				final List<BuffInfo> dances = target.getEffectList().getDances();
+				for (int i = dances.size() - 1; i >= 0; i--) // reverse order
+				{
+					final BuffInfo info = dances.get(i);
+					if (!info.getSkill().canBeStolen() || ((rate < 100) && !calcCancelSuccess(info, cancelMagicLvl, rate, skill, target)))
+					{
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max)
+					{
+						break;
+					}
+				}
 				
+				if (canceled.size() < max)
+				{
+					// Prevent initialization.
+					final List<BuffInfo> buffs = target.getEffectList().getBuffs();
 					for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
 					{
 						final BuffInfo info = buffs.get(i);
@@ -1074,6 +1091,7 @@ public final class Formulas
 							break;
 						}
 					}
+				}
 				break;
 			}
 			case DEBUFF: