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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**
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 247079dbb5..4b66df37da 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,7 +108,8 @@ public class ListenersContainer
 	
 	public boolean hasListener(EventType type)
 	{
-		return (_listeners != null) && !getListeners(type).isEmpty();
+		// FIXME: return (_listeners != null) && !getListeners(type).isEmpty();
+		return !getListeners(type).isEmpty();
 	}
 	
 	/**