diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 23a4ba5352..def42bed1f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -47,6 +47,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -595,6 +596,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 296f56f789..a53454e825 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -629,6 +630,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 296f56f789..a53454e825 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -629,6 +630,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 296f56f789..a53454e825 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -629,6 +630,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 53f38bb019..30ea265ed2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -629,6 +630,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 296f56f789..a53454e825 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -629,6 +630,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 296f56f789..a53454e825 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -629,6 +630,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 1cb00b078a..8586f2bb17 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -639,6 +640,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 23a4ba5352..def42bed1f 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -47,6 +47,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.ceremonyofchaos.OnCeremonyOfChaosMatchResult; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; +import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -595,6 +596,17 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } + @RegisterEvent(EventType.ON_PLAYER_LOGOUT) + @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) + private void OnPlayerLogout(OnPlayerLogout event) + { + final PlayerInstance player = event.getPlayer(); + if (player != null) + { + getMembers().remove(player.getObjectId()); + } + } + @RegisterEvent(EventType.ON_CREATURE_DEATH) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerDeath(OnCreatureDeath event)