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

Fixed traits exit called more than once.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDev
2018-04-06 02:52:31 +00:00
parent 34f65304b0
commit e6eb02a63e
14 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -57,6 +57,11 @@ public final class AttackTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _attackTraits.entrySet()) for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{ {
if (charStat.getAttackTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--; charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
} }

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -76,11 +76,21 @@ public final class DefenceTrait extends AbstractEffect
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 2.0f)
{ {
if (charStat.getDefenceTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--; charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
} }
else else
{ {
if (charStat.getTraitsInvul()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getTraitsInvul()[trait.getKey().ordinal()]--; charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
} }
} }

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

@@ -57,6 +57,11 @@ public final class AttackTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _attackTraits.entrySet()) for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{ {
if (charStat.getAttackTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--; charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
} }

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -76,11 +76,21 @@ public final class DefenceTrait extends AbstractEffect
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 2.0f)
{ {
if (charStat.getDefenceTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--; charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
} }
else else
{ {
if (charStat.getTraitsInvul()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getTraitsInvul()[trait.getKey().ordinal()]--; charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
} }
} }

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -57,6 +57,11 @@ public final class AttackTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _attackTraits.entrySet()) for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{ {
if (charStat.getAttackTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--; charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
} }

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -76,11 +76,21 @@ public final class DefenceTrait extends AbstractEffect
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 2.0f)
{ {
if (charStat.getDefenceTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--; charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
} }
else else
{ {
if (charStat.getTraitsInvul()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getTraitsInvul()[trait.getKey().ordinal()]--; charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
} }
} }

5
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -57,6 +57,11 @@ public final class AttackTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _attackTraits.entrySet()) for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{ {
if (charStat.getAttackTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--; charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
} }

10
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -76,11 +76,21 @@ public final class DefenceTrait extends AbstractEffect
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 2.0f)
{ {
if (charStat.getDefenceTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--; charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
} }
else else
{ {
if (charStat.getTraitsInvul()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getTraitsInvul()[trait.getKey().ordinal()]--; charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
} }
} }

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -59,6 +59,11 @@ public final class AttackTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _attackTraits.entrySet()) for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{ {
if (charStat.getAttackTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--; charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
} }

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -78,11 +78,21 @@ public final class DefenceTrait extends AbstractEffect
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 2.0f)
{ {
if (charStat.getDefenceTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--; charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
} }
else else
{ {
if (charStat.getTraitsInvul()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getTraitsInvul()[trait.getKey().ordinal()]--; charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
} }
} }

5
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -57,6 +57,11 @@ public final class AttackTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _attackTraits.entrySet()) for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{ {
if (charStat.getAttackTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--; charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
} }

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -76,11 +76,21 @@ public final class DefenceTrait extends AbstractEffect
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 2.0f)
{ {
if (charStat.getDefenceTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--; charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
} }
else else
{ {
if (charStat.getTraitsInvul()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getTraitsInvul()[trait.getKey().ordinal()]--; charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
} }
} }

5
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -57,6 +57,11 @@ public final class AttackTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _attackTraits.entrySet()) for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{ {
if (charStat.getAttackTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--; charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
} }

10
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -76,11 +76,21 @@ public final class DefenceTrait extends AbstractEffect
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 2.0f)
{ {
if (charStat.getDefenceTraitsCount()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue(); charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--; charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
} }
else else
{ {
if (charStat.getTraitsInvul()[trait.getKey().ordinal()] == 0)
{
return;
}
charStat.getTraitsInvul()[trait.getKey().ordinal()]--; charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
} }
} }