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

Fixed negative healing when player has limiting effects.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2020-06-28 00:14:49 +00:00
parent a3a76a85a0
commit 727fca9827
90 changed files with 135 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

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

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

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

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

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

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java vendored
View File

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java vendored
View File

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java vendored
View File

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

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

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

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

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

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

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

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

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

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

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

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

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

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

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

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

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

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

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

4
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java vendored
View File

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -130,7 +130,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -75,7 +75,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

4
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java vendored
View File

@@ -71,12 +71,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

4
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java vendored
View File

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java vendored
View File

@@ -66,12 +66,12 @@ public class Cp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp()); amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -125,7 +125,7 @@ public class Heal extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount != 0) if (amount != 0)
{ {
final double newHp = amount + effected.getCurrentHp(); final double newHp = amount + effected.getCurrentHp();

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class HealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
if (amount >= 0) if (amount >= 0)
{ {
if (amount != 0) if (amount != 0)

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java vendored
View File

@@ -66,12 +66,12 @@ public class Hp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp()); amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break; break;
} }
} }

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -70,7 +70,7 @@ public class ManaHealPercent extends AbstractEffect
} }
// Prevents overheal // Prevents overheal
amount = Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(amount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
if (amount != 0) if (amount != 0)
{ {
final double newMp = amount + effected.getCurrentMp(); final double newMp = amount + effected.getCurrentMp();

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java vendored
View File

@@ -66,12 +66,12 @@ public class Mp extends AbstractEffect
{ {
case DIFF: case DIFF:
{ {
amount = Math.min(basicAmount, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min(basicAmount, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
case PER: case PER:
{ {
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp()); amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break; break;
} }
} }