From 0f77e19227eb6d6136a7da27f14b7949d8b1486e Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 12 Sep 2017 11:22:10 +0000 Subject: [PATCH] Avoid BuffTimeTask NPE. --- .../com/l2jmobius/gameserver/model/skills/BuffTimeTask.java | 2 +- .../com/l2jmobius/gameserver/model/skills/BuffTimeTask.java | 2 +- .../com/l2jmobius/gameserver/model/skills/BuffTimeTask.java | 2 +- .../com/l2jmobius/gameserver/model/skills/BuffTimeTask.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java index 95404d1b22..cb509cb87f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java @@ -48,7 +48,7 @@ public class BuffTimeTask implements Runnable @Override public void run() { - if (_time.incrementAndGet() > _info.getAbnormalTime()) + if ((_info.getEffected() != null) && (_time.incrementAndGet() > _info.getAbnormalTime())) { _info.getEffected().getEffectList().stopSkillEffects(false, _info.getSkill().getId()); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java index 95404d1b22..cb509cb87f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java @@ -48,7 +48,7 @@ public class BuffTimeTask implements Runnable @Override public void run() { - if (_time.incrementAndGet() > _info.getAbnormalTime()) + if ((_info.getEffected() != null) && (_time.incrementAndGet() > _info.getAbnormalTime())) { _info.getEffected().getEffectList().stopSkillEffects(false, _info.getSkill().getId()); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java index 95404d1b22..cb509cb87f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java @@ -48,7 +48,7 @@ public class BuffTimeTask implements Runnable @Override public void run() { - if (_time.incrementAndGet() > _info.getAbnormalTime()) + if ((_info.getEffected() != null) && (_time.incrementAndGet() > _info.getAbnormalTime())) { _info.getEffected().getEffectList().stopSkillEffects(false, _info.getSkill().getId()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java index 95404d1b22..cb509cb87f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffTimeTask.java @@ -48,7 +48,7 @@ public class BuffTimeTask implements Runnable @Override public void run() { - if (_time.incrementAndGet() > _info.getAbnormalTime()) + if ((_info.getEffected() != null) && (_time.incrementAndGet() > _info.getAbnormalTime())) { _info.getEffected().getEffectList().stopSkillEffects(false, _info.getSkill().getId()); }