From 2207553fe1bac1f38b8292dacb90b91cb0eb789f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 18 Apr 2020 12:49:46 +0000 Subject: [PATCH] Changed OfflineTradeUtil trader config check. Contributed by pecanha. --- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- .../l2jmobius/gameserver/util/OfflineTradeUtil.java | 13 +++++-------- 17 files changed, 85 insertions(+), 136 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 6818a1605b..ebaa54ae63 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getSummon(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index c970df1e35..c08bc461ac 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getSummon(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index b1b01e7094..75656b49a5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -20,12 +20,12 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; /** @@ -104,13 +104,10 @@ public class OfflineTradeUtil World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); - if (Config.DUALBOX_COUNT_OFFLINE_TRADERS) + client.close(true); + if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS) { - client.close(true); - } - else - { - Disconnection.of(client, player).defaultSequence(false); + AntiFeedManager.getInstance().onDisconnect(client); } client.setDetached(true); @@ -122,9 +119,9 @@ public class OfflineTradeUtil if (pet != null) { pet.setRestoreSummon(true); - pet.unSummon(player); pet = player.getPet(); + // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) if (pet != null) {