From e33f1a261273b74092ae66d4c129adf56f44218b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 19 Nov 2020 23:26:24 +0000 Subject: [PATCH] Addition of AbstractEvent method removeMember. --- .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ .../model/ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../gameserver/model/eventengine/AbstractEvent.java | 5 +++++ 18 files changed, 54 insertions(+), 9 deletions(-) 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 8e46008a76..ee5b54f923 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 @@ -605,7 +605,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear(); 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 42f8f48185..c82fc4f646 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 @@ -639,7 +639,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear(); 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 42f8f48185..c82fc4f646 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 @@ -639,7 +639,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear(); 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 42f8f48185..c82fc4f646 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 @@ -639,7 +639,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear(); 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 461850b531..2dc69139bb 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 @@ -639,7 +639,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear(); 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 42f8f48185..c82fc4f646 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 @@ -639,7 +639,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear(); 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 42f8f48185..c82fc4f646 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 @@ -639,7 +639,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear(); 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 249581b121..079aec7d02 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 @@ -649,7 +649,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear(); 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 8e46008a76..ee5b54f923 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 @@ -605,7 +605,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent final PlayerInstance player = event.getPlayer(); if (player != null) { - getMembers().remove(player.getObjectId()); + removeMember(player.getObjectId()); } } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java index 569e883943..c7d0cb125f 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/AbstractEvent.java @@ -63,6 +63,11 @@ public abstract class AbstractEvent>extends Abs _members.put(member.getObjectId(), member); } + public void removeMember(int objectId) + { + _members.remove(objectId); + } + public void clearMembers() { _members.clear();