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

Fixed NPE in CreatureStat class.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-11-01 12:49:02 +00:00
parent cdb887efae
commit 921b24bdb4
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -22,6 +22,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.Elementals;
import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.transform.Transform;
import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.Weapon;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
@@ -92,9 +93,10 @@ public class CreatureStat
} }
// Apply transformation stats. // Apply transformation stats.
if (_creature.isPlayer() && _creature.isTransformed()) final Transform transform = _creature.getTransformation();
if (transform != null)
{ {
final double val = _creature.getTransformation().getStat(_creature.getActingPlayer(), stat); final double val = transform.getStat(_creature.getActingPlayer(), stat);
if (val > 0) if (val > 0)
{ {
value = val; value = val;
@@ -550,10 +552,12 @@ public class CreatureStat
public int getPhysicalAttackRange() public int getPhysicalAttackRange()
{ {
final Weapon weapon = _creature.getActiveWeaponItem(); final Weapon weapon = _creature.getActiveWeaponItem();
final Transform transform = _creature.getTransformation();
int baseAttackRange; int baseAttackRange;
if (_creature.isTransformed() && _creature.isPlayer()) if (transform != null)
{ {
baseAttackRange = _creature.getTransformation().getBaseAttackRange(_creature.getActingPlayer()); baseAttackRange = transform.getBaseAttackRange(_creature.getActingPlayer());
} }
else if (weapon != null) else if (weapon != null)
{ {

12
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -22,6 +22,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.Elementals;
import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.transform.Transform;
import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.Weapon;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
@@ -92,9 +93,10 @@ public class CreatureStat
} }
// Apply transformation stats. // Apply transformation stats.
if (_creature.isPlayer() && _creature.isTransformed()) final Transform transform = _creature.getTransformation();
if (transform != null)
{ {
final double val = _creature.getTransformation().getStat(_creature.getActingPlayer(), stat); final double val = transform.getStat(_creature.getActingPlayer(), stat);
if (val > 0) if (val > 0)
{ {
value = val; value = val;
@@ -550,10 +552,12 @@ public class CreatureStat
public int getPhysicalAttackRange() public int getPhysicalAttackRange()
{ {
final Weapon weapon = _creature.getActiveWeaponItem(); final Weapon weapon = _creature.getActiveWeaponItem();
final Transform transform = _creature.getTransformation();
int baseAttackRange; int baseAttackRange;
if (_creature.isTransformed() && _creature.isPlayer()) if (transform != null)
{ {
baseAttackRange = _creature.getTransformation().getBaseAttackRange(_creature.getActingPlayer()); baseAttackRange = transform.getBaseAttackRange(_creature.getActingPlayer());
} }
else if (weapon != null) else if (weapon != null)
{ {