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

Fixed summoning Cubic NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-10-10 21:59:00 +00:00
parent 3cdb31b034
commit beff746963
14 changed files with 42 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

8
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

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

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

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

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

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

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

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

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

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

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

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

8
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java vendored
View File

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