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

Fixed cubic removal array index out of bounds exception.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-06-30 14:27:23 +00:00
parent 4e3f43c102
commit ff0b12f059
12 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

@ -91,9 +91,9 @@ public final class SummonCubic extends AbstractEffect
// If maximum amount is reached, random cubic is removed. // If maximum amount is reached, random cubic is removed.
// Players with no mastery can have only one cubic. // Players with no mastery can have only one cubic.
final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1); final int allowedCubicCount = (int) effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 1);
final int currentCubicCount = player.getCubics().size() + 1; final int currentCubicCount = player.getCubics().size();
// Extra cubics are removed, one by one, randomly. // Extra cubics are removed, one by one, randomly.
for (int i = 0; i <= (currentCubicCount - allowedCubicCount); i++) for (int i = 0; i <= ((currentCubicCount + 1) - allowedCubicCount); i++)
{ {
final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)]; final int removedCubicId = (int) player.getCubics().keySet().toArray()[Rnd.get(currentCubicCount)];
final CubicInstance removedCubic = player.getCubicById(removedCubicId); final CubicInstance removedCubic = player.getCubicById(removedCubicId);