AbstractEvent changes for offline members.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -459,7 +459,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -503,7 +503,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -459,7 +459,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -453,7 +453,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -453,7 +453,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -453,7 +453,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -453,7 +453,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -453,7 +453,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -453,7 +453,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -453,7 +453,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java

@@ -453,7 +453,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
 			}
 		}
 		
-		getMembers().clear();
+		clearMembers();
 		_instance.destroy();
 	}
 	

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java

@@ -17,7 +17,9 @@
 package org.l2jmobius.gameserver.model.eventengine;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -35,12 +37,25 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 	
 	public Map<Integer, T> getMembers()
 	{
-		return _members;
+		final Map<Integer, T> members = new HashMap<>();
+		for (Entry<Integer, T> entry : _members.entrySet())
+		{
+			final T member = entry.getValue();
+			if (member != null)
+			{
+				final PlayerInstance player = member.getPlayer();
+				if ((player != null) && player.isOnline() && !player.isInOfflineMode())
+				{
+					members.putIfAbsent(entry.getKey(), member);
+				}
+			}
+		}
+		return members;
 	}
 	
 	public T getMember(int objectId)
 	{
-		return _members.get(objectId);
+		return getMembers().get(objectId);
 	}
 	
 	public void addMember(T member)
@@ -48,6 +63,11 @@ public abstract class AbstractEvent<T extends AbstractEventMember<?>>extends Abs
 		_members.put(member.getObjectId(), member);
 	}
 	
+	public void clearMembers()
+	{
+		_members.clear();
+	}
+	
 	public void broadcastPacket(IClientOutgoingPacket... packets)
 	{
 		_members.values().forEach(member -> member.sendPacket(packets));

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventMember.java

@@ -51,7 +51,7 @@ public abstract class AbstractEventMember<T extends AbstractEvent<?>>
 	public void sendPacket(IClientOutgoingPacket... packets)
 	{
 		final PlayerInstance player = getPlayer();
-		if (player != null)
+		if ((player != null) && player.isOnline() && !player.isInOfflineMode())
 		{
 			for (IClientOutgoingPacket packet : packets)
 			{