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

Fixed probable AbsorbDamage NPE.

Browse Source
This commit is contained in:
MobiusDev 2017-11-07 10:48:23 +00:00
parent a5995c7f00
commit 0e96f5d690
8 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ public class AbsorbDamage extends AbstractEffect
final int objectId = event.getTarget().getObjectId(); final int objectId = event.getTarget().getObjectId();
final double damageLeft = _damageHolder.get(objectId); final double damageLeft = _damageHolder.get(objectId) != null ? _damageHolder.get(objectId) : 0;
final double newDamageLeft = Math.max(damageLeft - event.getDamage(), 0); final double newDamageLeft = Math.max(damageLeft - event.getDamage(), 0);
final double newDamage = Math.max(event.getDamage() - damageLeft, 0); final double newDamage = Math.max(event.getDamage() - damageLeft, 0);

1
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java
View File

@ -47,7 +47,6 @@ public class FunctionEventListener extends AbstractEventListener
try try
{ {
return returnBackClass.cast(_callback.apply(event)); return returnBackClass.cast(_callback.apply(event));
} }
catch (Exception e) catch (Exception e)
{ {

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

@ -50,7 +50,7 @@ public class AbsorbDamage extends AbstractEffect
final int objectId = event.getTarget().getObjectId(); final int objectId = event.getTarget().getObjectId();
final double damageLeft = _damageHolder.get(objectId); final double damageLeft = _damageHolder.get(objectId) != null ? _damageHolder.get(objectId) : 0;
final double newDamageLeft = Math.max(damageLeft - event.getDamage(), 0); final double newDamageLeft = Math.max(damageLeft - event.getDamage(), 0);
final double newDamage = Math.max(event.getDamage() - damageLeft, 0); final double newDamage = Math.max(event.getDamage() - damageLeft, 0);

1
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java
View File

@ -47,7 +47,6 @@ public class FunctionEventListener extends AbstractEventListener
try try
{ {
return returnBackClass.cast(_callback.apply(event)); return returnBackClass.cast(_callback.apply(event));
} }
catch (Exception e) catch (Exception e)
{ {

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

@ -50,7 +50,7 @@ public class AbsorbDamage extends AbstractEffect
final int objectId = event.getTarget().getObjectId(); final int objectId = event.getTarget().getObjectId();
final double damageLeft = _damageHolder.get(objectId); final double damageLeft = _damageHolder.get(objectId) != null ? _damageHolder.get(objectId) : 0;
final double newDamageLeft = Math.max(damageLeft - event.getDamage(), 0); final double newDamageLeft = Math.max(damageLeft - event.getDamage(), 0);
final double newDamage = Math.max(event.getDamage() - damageLeft, 0); final double newDamage = Math.max(event.getDamage() - damageLeft, 0);

1
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java
View File

@ -47,7 +47,6 @@ public class FunctionEventListener extends AbstractEventListener
try try
{ {
return returnBackClass.cast(_callback.apply(event)); return returnBackClass.cast(_callback.apply(event));
} }
catch (Exception e) catch (Exception e)
{ {

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

@ -50,7 +50,7 @@ public class AbsorbDamage extends AbstractEffect
final int objectId = event.getTarget().getObjectId(); final int objectId = event.getTarget().getObjectId();
final double damageLeft = _damageHolder.get(objectId); final double damageLeft = _damageHolder.get(objectId) != null ? _damageHolder.get(objectId) : 0;
final double newDamageLeft = Math.max(damageLeft - event.getDamage(), 0); final double newDamageLeft = Math.max(damageLeft - event.getDamage(), 0);
final double newDamage = Math.max(event.getDamage() - damageLeft, 0); final double newDamage = Math.max(event.getDamage() - damageLeft, 0);

1
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java
View File

@ -47,7 +47,6 @@ public class FunctionEventListener extends AbstractEventListener
try try
{ {
return returnBackClass.cast(_callback.apply(event)); return returnBackClass.cast(_callback.apply(event));
} }
catch (Exception e) catch (Exception e)
{ {