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

Fixed probable trap task NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-12-18 22:46:08 +00:00
parent 31e7c50c12
commit 0ca0d081e7
34 changed files with 119 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
public Skill getSkill()
{
if (_skill == null)
{
return null;
}
return _skill.getSkill();
}

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.tasks.npc.trap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.actor.instance.TrapInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
/**
@@ -57,7 +58,8 @@ public class TrapTask implements Runnable
}
}
if (!_trap.getSkill().getTargetsAffected(_trap, _trap).isEmpty())
final Skill skill = _trap.getSkill();
if ((skill != null) && !skill.getTargetsAffected(_trap, _trap).isEmpty())
{
_trap.triggerTrap(_trap);
}