From 0ca0d081e7590b3b587ecbd95b73400145ffecb5 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 18 Dec 2020 22:46:08 +0000
Subject: [PATCH] Fixed probable trap task NPE.

---
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 .../gameserver/model/actor/instance/TrapInstance.java         | 4 ++++
 .../gameserver/model/actor/tasks/npc/trap/TrapTask.java       | 4 +++-
 34 files changed, 119 insertions(+), 17 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index feaacde62e..9ffe593e15 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index feaacde62e..9ffe593e15 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index feaacde62e..9ffe593e15 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index b10148b203..6da6423e70 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
index feaacde62e..9ffe593e15 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
@@ -213,6 +213,10 @@ public class TrapInstance extends Npc
 	
 	public Skill getSkill()
 	{
+		if (_skill == null)
+		{
+			return null;
+		}
 		return _skill.getSkill();
 	}
 	
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
index b43ac484f6..25f5a97511 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -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);
 				}