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

Fixed probable Kartia Helper NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-04-21 21:07:49 +00:00
parent 27d6e96118
commit d7fda7eada
28 changed files with 224 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java vendored
View File

@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
@@ -150,8 +151,13 @@ public final class KartiaHelperAdolph extends AbstractNpcAI
public void useRandomSkill(Npc npc)
{
final Instance instance = npc.getInstanceWorld();
final Npc target = (Npc) npc.getTarget();
if ((instance != null) && !npc.isCastingNow() && (target != null) && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
final WorldObject target = npc.getTarget();
if (target == null)
{
return;
}
if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
{
final StatsSet instParams = instance.getTemplateParameters();
final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate");

10
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java vendored
View File

@@ -20,6 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
@@ -164,8 +165,13 @@ public final class KartiaHelperBarton extends AbstractNpcAI
public void useRandomSkill(Npc npc)
{
final Instance instance = npc.getInstanceWorld();
final Npc target = (Npc) npc.getTarget();
if ((instance != null) && !npc.isCastingNow() && (target != null) && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
final WorldObject target = npc.getTarget();
if (target == null)
{
return;
}
if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
{
final StatsSet instParams = instance.getTemplateParameters();
final SkillHolder skill_01 = instParams.getSkillHolder("bartonInfinity");

10
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java vendored
View File

@@ -19,6 +19,7 @@ package instances.KartiasLabyrinth;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
@@ -172,8 +173,13 @@ public final class KartiaHelperGuardian extends AbstractNpcAI
public void useRandomSkill(Npc npc)
{
final Instance instance = npc.getInstanceWorld();
final Npc target = (Npc) npc.getTarget();
if ((instance != null) && !npc.isCastingNow() && (target != null) && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
final WorldObject target = npc.getTarget();
if (target == null)
{
return;
}
if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
{
final StatsSet instParams = instance.getTemplateParameters();
final SkillHolder skill_01 = instParams.getSkillHolder("guardianSpiritsBlow");

10
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java vendored
View File

@@ -20,6 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
@@ -165,8 +166,13 @@ public final class KartiaHelperHayuk extends AbstractNpcAI
public void useRandomSkill(Npc npc)
{
final Instance instance = npc.getInstanceWorld();
final Npc target = (Npc) npc.getTarget();
if ((instance != null) && !npc.isCastingNow() && (target != null) && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
final WorldObject target = npc.getTarget();
if (target == null)
{
return;
}
if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
{
final StatsSet instParams = instance.getTemplateParameters();
final SkillHolder skill_01 = instParams.getSkillHolder("hayukPinpointShot");