From 30296c01575eaa46ecc7477b48ec81a70a5c394e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 29 Jan 2022 22:58:19 +0000 Subject: [PATCH] Removed OnPlayerLogout event from Disconnection. Contributed by nasseka. --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 7 ++++++- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- .../org/l2jmobius/gameserver/network/Disconnection.java | 3 --- 23 files changed, 6 insertions(+), 67 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 3741f8c977..5fd13392b3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -285,6 +285,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.model.zone.ZoneId; +import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.model.zone.type.WaterZone; import org.l2jmobius.gameserver.network.Disconnection; @@ -11183,7 +11184,11 @@ public class Player extends Playable getEffectList().stopAllToggles(); // Remove from world regions zones - ZoneManager.getInstance().getRegion(this).removeFromZones(this); + final ZoneRegion region = ZoneManager.getInstance().getRegion(this); + if (region != null) + { + region.removeFromZones(this); + } // If a Party is in progress, leave it (and festival party) if (isInParty()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/Disconnection.java index e907351e9e..c8106b96b2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/Disconnection.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/Disconnection.java @@ -21,8 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; @@ -138,7 +136,6 @@ public class Disconnection { if ((_player != null) && _player.isOnline()) { - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player); _player.deleteMe(); } }