From 3918bbc997132d1df7ca0ddaf61767437f3f16a2 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 17 Sep 2021 14:03:38 +0000
Subject: [PATCH] AbstractScript uses NPC templates to register events.

---
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java | 10 ++++++++--
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java | 10 ++++++++--
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 .../java/org/l2jmobius/gameserver/model/actor/Npc.java |  6 ++++++
 .../gameserver/model/events/ListenersContainer.java    |  3 +--
 42 files changed, 151 insertions(+), 46 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 29a3deea8e..da77da4f2a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..44776502e8 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..44776502e8 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..44776502e8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..44776502e8 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..44776502e8 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..44776502e8 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..44776502e8 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java
index b3f7db3fa1..5156f6319c 100644
--- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1512,6 +1512,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java
index b3f7db3fa1..5156f6319c 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1512,6 +1512,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 7733e12ee2..2e8912f0a5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1751,8 +1751,14 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
-	 * Send an "event" to all NPC's within given radius
+	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
 	 * @param radius - radius to send event
 	 * @param reference - WorldObject to pass, if needed
@@ -1761,7 +1767,7 @@ public class Npc extends Creature
 	{
 		World.getInstance().forEachVisibleObjectInRange(this, Npc.class, radius, obj ->
 		{
-			if (obj.isNpc() && obj.hasListener(EventType.ON_NPC_EVENT_RECEIVED))
+			if (obj.hasListener(EventType.ON_NPC_EVENT_RECEIVED))
 			{
 				EventDispatcher.getInstance().notifyEventAsync(new OnNpcEventReceived(eventName, this, obj, reference), obj);
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 7733e12ee2..2e8912f0a5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1751,8 +1751,14 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
-	 * Send an "event" to all NPC's within given radius
+	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
 	 * @param radius - radius to send event
 	 * @param reference - WorldObject to pass, if needed
@@ -1761,7 +1767,7 @@ public class Npc extends Creature
 	{
 		World.getInstance().forEachVisibleObjectInRange(this, Npc.class, radius, obj ->
 		{
-			if (obj.isNpc() && obj.hasListener(EventType.ON_NPC_EVENT_RECEIVED))
+			if (obj.hasListener(EventType.ON_NPC_EVENT_RECEIVED))
 			{
 				EventDispatcher.getInstance().notifyEventAsync(new OnNpcEventReceived(eventName, this, obj, reference), obj);
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 5ed095baa4..271a4d060d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 5ed095baa4..271a4d060d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 5ed095baa4..271a4d060d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1511,6 +1511,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 050f15b78d..c6c4847cb2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1523,6 +1523,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 050f15b78d..c6c4847cb2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1523,6 +1523,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 050f15b78d..c6c4847cb2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1523,6 +1523,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 044002951d..d9de52b765 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1495,6 +1495,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 6fbde3d9db..b3d05032fe 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1524,6 +1524,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 6fbde3d9db..b3d05032fe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1524,6 +1524,12 @@ public class Npc extends Creature
 		return vars != null ? vars : addScript(new NpcVariables());
 	}
 	
+	@Override
+	public boolean hasListener(EventType type)
+	{
+		return getTemplate().hasListener(type);
+	}
+	
 	/**
 	 * Send an "event" to all NPCs within given radius
 	 * @param eventName - name of event
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
index 4b66df37da..247079dbb5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/ListenersContainer.java
@@ -108,8 +108,7 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
-		return !getListeners(type).isEmpty();
+		return (_listeners != null) && !getListeners(type).isEmpty();
 	}
 	
 	/**