lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed cancellation not removing dances.

Browse Source
This commit is contained in:
MobiusDev 2019-03-11 09:56:48 +00:00
parent a3b838200b
commit 0c08e144c4
22 changed files with 341 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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

9
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -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

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

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