From 0fede59c14d562b67c23a37016b9d40bd24e8dde Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 1 May 2021 23:47:01 +0000 Subject: [PATCH] TradeController class is an instance manager. --- .../java/org/l2jmobius/gameserver/GameServer.java | 3 ++- .../java/org/l2jmobius/gameserver/Shutdown.java | 3 ++- .../handler/admincommandhandlers/AdminEditNpc.java | 12 ++++++------ .../handler/admincommandhandlers/AdminReload.java | 4 ++-- .../handler/admincommandhandlers/AdminShop.java | 4 ++-- .../TradeManager.java} | 12 ++++++------ .../actor/instance/CastleChamberlainInstance.java | 4 ++-- .../actor/instance/ClanHallManagerInstance.java | 4 ++-- .../model/actor/instance/FishermanInstance.java | 4 ++-- .../model/actor/instance/ManorManagerInstance.java | 4 ++-- .../model/actor/instance/MercManagerInstance.java | 4 ++-- .../model/actor/instance/MerchantInstance.java | 6 +++--- .../network/clientpackets/RequestBuyItem.java | 8 ++++---- .../network/clientpackets/RequestWearItem.java | 4 ++-- .../gameserver/taskmanager/BuyListTaskManager.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 3 ++- .../java/org/l2jmobius/gameserver/Shutdown.java | 3 ++- .../handler/admincommandhandlers/AdminEditNpc.java | 12 ++++++------ .../handler/admincommandhandlers/AdminReload.java | 4 ++-- .../handler/admincommandhandlers/AdminShop.java | 4 ++-- .../TradeManager.java} | 12 ++++++------ .../actor/instance/CastleChamberlainInstance.java | 4 ++-- .../actor/instance/ClanHallManagerInstance.java | 4 ++-- .../model/actor/instance/FishermanInstance.java | 4 ++-- .../model/actor/instance/ManorManagerInstance.java | 4 ++-- .../model/actor/instance/MercManagerInstance.java | 4 ++-- .../model/actor/instance/MerchantInstance.java | 6 +++--- .../network/clientpackets/RequestBuyItem.java | 8 ++++---- .../network/clientpackets/RequestWearItem.java | 4 ++-- .../gameserver/taskmanager/BuyListTaskManager.java | 6 +++--- 30 files changed, 84 insertions(+), 80 deletions(-) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{TradeController.java => instancemanager/TradeManager.java} (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{TradeController.java => instancemanager/TradeManager.java} (94%) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java index 45cd05e47e..54a4eb39ad 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java @@ -102,6 +102,7 @@ import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.instancemanager.RecipeManager; import org.l2jmobius.gameserver.instancemanager.ServerRestartManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.instancemanager.events.EventManager; import org.l2jmobius.gameserver.instancemanager.events.PcPoint; import org.l2jmobius.gameserver.instancemanager.games.Lottery; @@ -256,7 +257,7 @@ public class GameServer GeoEngine.getInstance(); Util.printSection("Economy"); - TradeController.getInstance(); + TradeManager.getInstance(); MultisellData.getInstance(); Util.printSection("Clan Halls"); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java index 4d69331161..3767651f23 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.instancemanager.PrecautionaryRestartManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; @@ -445,7 +446,7 @@ public class Shutdown extends Thread LOGGER.info("GrandBossManager: All Grand Boss info saved!!"); // Save data CountStore - TradeController.getInstance().dataCountStore(); + TradeManager.getInstance().dataCountStore(); LOGGER.info("TradeController: All count Item Saved!!"); // Save Olympiad status diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 5281470473..1375b63624 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -29,12 +29,12 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.Skill; @@ -488,7 +488,7 @@ public class AdminEditNpc implements IAdminCommandHandler { final int tradeListID = Integer.parseInt(args[1]); final int itemId = Integer.parseInt(args[2]); - final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); + final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID); final Item item = ItemTable.getInstance().getTemplate(itemId); if (tradeList.getPriceForItemId(itemId) < 0) { @@ -531,7 +531,7 @@ public class AdminEditNpc implements IAdminCommandHandler { final int tradeListID = Integer.parseInt(args[1]); final int itemID = Integer.parseInt(args[2]); - final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); + final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID); if (tradeList.getPriceForItemId(itemID) < 0) { return; @@ -571,7 +571,7 @@ public class AdminEditNpc implements IAdminCommandHandler private void addShopItem(PlayerInstance activeChar, String[] args) { final int tradeListID = Integer.parseInt(args[1]); - final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); + final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID); if (tradeList == null) { BuilderUtil.sendSysMessage(activeChar, "TradeList not found!"); @@ -622,7 +622,7 @@ public class AdminEditNpc implements IAdminCommandHandler private void showShopList(PlayerInstance activeChar, int tradeListID, int page) { - final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); + final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID); if ((page > ((tradeList.getItems().size() / PAGE_LIMIT) + 1)) || (page < 1)) { return; @@ -798,7 +798,7 @@ public class AdminEditNpc implements IAdminCommandHandler if (pos >= 0) { final int tradeListID = Integer.decode(line.substring(pos + target.length() + 1).split("\"")[0]); - tradeLists.add(TradeController.getInstance().getBuyList(tradeListID)); + tradeLists.add(TradeManager.getInstance().getBuyList(tradeListID)); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java index f0349ecc2b..8a3e5f9a98 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java @@ -20,7 +20,6 @@ import java.util.StringTokenizer; import org.l2jmobius.Config; import org.l2jmobius.commons.enums.ServerMode; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.SkillTable; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.WalkerRouteData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.QuestManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.util.BuilderUtil; @@ -118,7 +118,7 @@ public class AdminReload implements IAdminCommandHandler } else if (type.equals("tradelist")) { - TradeController.getInstance(); + TradeManager.getInstance(); sendReloadPage(activeChar); BuilderUtil.sendSysMessage(activeChar, "TradeList Table reloaded."); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java index f40ce36926..fd619e311c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.logging.Logger; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -80,7 +80,7 @@ public class AdminShop implements IAdminCommandHandler LOGGER.warning("admin buylist failed:" + command); } - final StoreTradeList list = TradeController.getInstance().getBuyList(val); + final StoreTradeList list = TradeManager.getInstance().getBuyList(val); if (list != null) { activeChar.sendPacket(new BuyList(list, activeChar.getAdena())); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/TradeController.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java similarity index 94% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/TradeController.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java index 37576a6972..d9f3995de5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/TradeController.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver; +package org.l2jmobius.gameserver.instancemanager; import java.sql.Connection; import java.sql.PreparedStatement; @@ -36,15 +36,15 @@ import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** * @version $Revision: 1.5.4.13 $ $Date: 2005/04/06 16:13:38 $ */ -public class TradeController +public class TradeManager { - private static final Logger LOGGER = Logger.getLogger(TradeController.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeManager.class.getName()); private int _nextListId; private final Map _lists; private final Map _listsTaskItem; - protected TradeController() + protected TradeManager() { boolean limitedItem = false; _lists = new HashMap<>(); @@ -487,13 +487,13 @@ public class TradeController return _nextListId++; } - public static TradeController getInstance() + public static TradeManager getInstance() { return SingletonHolder.INSTANCE; } private static class SingletonHolder { - protected static final TradeController INSTANCE = new TradeController(); + protected static final TradeManager INSTANCE = new TradeManager(); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java index 953323a5b1..4127e74d9c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; @@ -287,7 +287,7 @@ public class CastleChamberlainInstance extends FolkInstance buy = Integer.parseInt(val + "2"); } } - final StoreTradeList list = TradeController.getInstance().getBuyList(buy); + final StoreTradeList list = TradeManager.getInstance().getBuyList(buy); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), 0)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java index 178165090a..92534150ae 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java @@ -20,11 +20,11 @@ import java.text.SimpleDateFormat; import java.util.StringTokenizer; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.TeleportLocationTable; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StoreTradeList; @@ -1085,7 +1085,7 @@ public class ClanHallManagerInstance extends FolkInstance player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index b5c815b6ef..5ed98bf6ca 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.SkillTreeTable; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.StoreTradeList; @@ -63,7 +63,7 @@ public class FishermanInstance extends FolkInstance taxRate = getCastle().getTaxRate(); } player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java index 1b1697b9ac..92fa328062 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.StringTokenizer; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -105,7 +105,7 @@ public class ManorManagerInstance extends MerchantInstance final double taxRate = 0; player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(Integer.parseInt(value)); + final StoreTradeList list = TradeManager.getInstance().getBuyList(Integer.parseInt(value)); if (list != null) { list.getItems().get(0).setCount(1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java index d7e9f2e16b..01315b58a7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.ai.CtrlIntention; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; @@ -115,7 +115,7 @@ public class MercManagerInstance extends FolkInstance private void showBuyWindow(PlayerInstance player, int value) { player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), 0)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java index 654274f420..d5088c4313 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.GameClient; @@ -68,7 +68,7 @@ public class MerchantInstance extends FolkInstance private void showWearWindow(PlayerInstance player, int value) { player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if (list != null) { player.sendPacket(new WearList(list, player.getAdena(), player.getExpertiseIndex())); @@ -95,7 +95,7 @@ public class MerchantInstance extends FolkInstance player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 6a4d42ba4e..949be9403e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.CastleChamberlainInstance; @@ -169,7 +169,7 @@ public class RequestBuyItem implements IClientIncomingPacket StoreTradeList list = null; if (merchant != null) { - final List lists = TradeController.getInstance().getBuyListByNpcId(merchant.getNpcId()); + final List lists = TradeManager.getInstance().getBuyListByNpcId(merchant.getNpcId()); if (!player.isGM()) { if (lists == null) @@ -187,12 +187,12 @@ public class RequestBuyItem implements IClientIncomingPacket } else { - list = TradeController.getInstance().getBuyList(_listId); + list = TradeManager.getInstance().getBuyList(_listId); } } else { - list = TradeController.getInstance().getBuyList(_listId); + list = TradeManager.getInstance().getBuyList(_listId); } if (list == null) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java index deddf6f9a9..39f9f5ae83 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java @@ -22,8 +22,8 @@ import java.util.concurrent.Future; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance; @@ -152,7 +152,7 @@ public class RequestWearItem implements IClientIncomingPacket return; } - final List lists = TradeController.getInstance().getBuyListByNpcId(merchant.getNpcId()); + final List lists = TradeManager.getInstance().getBuyListByNpcId(merchant.getNpcId()); if (lists == null) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id.", Config.DEFAULT_PUNISH); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index cf7c054fe3..07ce439e78 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.TradeController; +import org.l2jmobius.gameserver.instancemanager.TradeManager; /** * @author Mobius @@ -82,8 +82,8 @@ public class BuyListTaskManager time = PENDING_UPDATES.get(0); PENDING_UPDATES.remove(time); } - TradeController.getInstance().restoreCount(time.intValue()); - TradeController.getInstance().dataTimerSave(time.intValue()); + TradeManager.getInstance().restoreCount(time.intValue()); + TradeManager.getInstance().dataTimerSave(time.intValue()); } _workingSaves = false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index a6423e9d39..9639d41fd4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -106,6 +106,7 @@ import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.instancemanager.RecipeManager; import org.l2jmobius.gameserver.instancemanager.ServerRestartManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.instancemanager.events.EventManager; import org.l2jmobius.gameserver.instancemanager.events.PcPoint; import org.l2jmobius.gameserver.instancemanager.games.Lottery; @@ -261,7 +262,7 @@ public class GameServer GeoEngine.getInstance(); Util.printSection("Economy"); - TradeController.getInstance(); + TradeManager.getInstance(); MultisellData.getInstance(); Util.printSection("Clan Halls"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java index e0c1f0cc9a..43cd9d957e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.instancemanager.PrecautionaryRestartManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; @@ -447,7 +448,7 @@ public class Shutdown extends Thread LOGGER.info("GrandBossManager: All Grand Boss info saved!!"); // Save data CountStore - TradeController.getInstance().dataCountStore(); + TradeManager.getInstance().dataCountStore(); LOGGER.info("TradeController: All count Item Saved!!"); // Save Olympiad status diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 5281470473..1375b63624 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -29,12 +29,12 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.Skill; @@ -488,7 +488,7 @@ public class AdminEditNpc implements IAdminCommandHandler { final int tradeListID = Integer.parseInt(args[1]); final int itemId = Integer.parseInt(args[2]); - final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); + final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID); final Item item = ItemTable.getInstance().getTemplate(itemId); if (tradeList.getPriceForItemId(itemId) < 0) { @@ -531,7 +531,7 @@ public class AdminEditNpc implements IAdminCommandHandler { final int tradeListID = Integer.parseInt(args[1]); final int itemID = Integer.parseInt(args[2]); - final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); + final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID); if (tradeList.getPriceForItemId(itemID) < 0) { return; @@ -571,7 +571,7 @@ public class AdminEditNpc implements IAdminCommandHandler private void addShopItem(PlayerInstance activeChar, String[] args) { final int tradeListID = Integer.parseInt(args[1]); - final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); + final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID); if (tradeList == null) { BuilderUtil.sendSysMessage(activeChar, "TradeList not found!"); @@ -622,7 +622,7 @@ public class AdminEditNpc implements IAdminCommandHandler private void showShopList(PlayerInstance activeChar, int tradeListID, int page) { - final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); + final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID); if ((page > ((tradeList.getItems().size() / PAGE_LIMIT) + 1)) || (page < 1)) { return; @@ -798,7 +798,7 @@ public class AdminEditNpc implements IAdminCommandHandler if (pos >= 0) { final int tradeListID = Integer.decode(line.substring(pos + target.length() + 1).split("\"")[0]); - tradeLists.add(TradeController.getInstance().getBuyList(tradeListID)); + tradeLists.add(TradeManager.getInstance().getBuyList(tradeListID)); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java index f0349ecc2b..8a3e5f9a98 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java @@ -20,7 +20,6 @@ import java.util.StringTokenizer; import org.l2jmobius.Config; import org.l2jmobius.commons.enums.ServerMode; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.SkillTable; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.WalkerRouteData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.QuestManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.util.BuilderUtil; @@ -118,7 +118,7 @@ public class AdminReload implements IAdminCommandHandler } else if (type.equals("tradelist")) { - TradeController.getInstance(); + TradeManager.getInstance(); sendReloadPage(activeChar); BuilderUtil.sendSysMessage(activeChar, "TradeList Table reloaded."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java index f40ce36926..fd619e311c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.logging.Logger; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -80,7 +80,7 @@ public class AdminShop implements IAdminCommandHandler LOGGER.warning("admin buylist failed:" + command); } - final StoreTradeList list = TradeController.getInstance().getBuyList(val); + final StoreTradeList list = TradeManager.getInstance().getBuyList(val); if (list != null) { activeChar.sendPacket(new BuyList(list, activeChar.getAdena())); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java index 37576a6972..d9f3995de5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver; +package org.l2jmobius.gameserver.instancemanager; import java.sql.Connection; import java.sql.PreparedStatement; @@ -36,15 +36,15 @@ import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** * @version $Revision: 1.5.4.13 $ $Date: 2005/04/06 16:13:38 $ */ -public class TradeController +public class TradeManager { - private static final Logger LOGGER = Logger.getLogger(TradeController.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeManager.class.getName()); private int _nextListId; private final Map _lists; private final Map _listsTaskItem; - protected TradeController() + protected TradeManager() { boolean limitedItem = false; _lists = new HashMap<>(); @@ -487,13 +487,13 @@ public class TradeController return _nextListId++; } - public static TradeController getInstance() + public static TradeManager getInstance() { return SingletonHolder.INSTANCE; } private static class SingletonHolder { - protected static final TradeController INSTANCE = new TradeController(); + protected static final TradeManager INSTANCE = new TradeManager(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java index 953323a5b1..4127e74d9c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; @@ -287,7 +287,7 @@ public class CastleChamberlainInstance extends FolkInstance buy = Integer.parseInt(val + "2"); } } - final StoreTradeList list = TradeController.getInstance().getBuyList(buy); + final StoreTradeList list = TradeManager.getInstance().getBuyList(buy); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), 0)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java index 178165090a..92534150ae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java @@ -20,11 +20,11 @@ import java.text.SimpleDateFormat; import java.util.StringTokenizer; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.TeleportLocationTable; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StoreTradeList; @@ -1085,7 +1085,7 @@ public class ClanHallManagerInstance extends FolkInstance player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index 28d746a11b..917da4fe0a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.SkillTreeTable; import org.l2jmobius.gameserver.instancemanager.FishingChampionshipManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.StoreTradeList; @@ -65,7 +65,7 @@ public class FishermanInstance extends FolkInstance taxRate = getCastle().getTaxRate(); } player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java index 1b1697b9ac..92fa328062 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.StringTokenizer; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -105,7 +105,7 @@ public class ManorManagerInstance extends MerchantInstance final double taxRate = 0; player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(Integer.parseInt(value)); + final StoreTradeList list = TradeManager.getInstance().getBuyList(Integer.parseInt(value)); if (list != null) { list.getItems().get(0).setCount(1); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java index d7e9f2e16b..01315b58a7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.ai.CtrlIntention; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; @@ -115,7 +115,7 @@ public class MercManagerInstance extends FolkInstance private void showBuyWindow(PlayerInstance player, int value) { player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), 0)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java index 654274f420..d5088c4313 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.GameClient; @@ -68,7 +68,7 @@ public class MerchantInstance extends FolkInstance private void showWearWindow(PlayerInstance player, int value) { player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if (list != null) { player.sendPacket(new WearList(list, player.getAdena(), player.getExpertiseIndex())); @@ -95,7 +95,7 @@ public class MerchantInstance extends FolkInstance player.tempInvetoryDisable(); - final StoreTradeList list = TradeController.getInstance().getBuyList(value); + final StoreTradeList list = TradeManager.getInstance().getBuyList(value); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 6a4d42ba4e..949be9403e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.CastleChamberlainInstance; @@ -169,7 +169,7 @@ public class RequestBuyItem implements IClientIncomingPacket StoreTradeList list = null; if (merchant != null) { - final List lists = TradeController.getInstance().getBuyListByNpcId(merchant.getNpcId()); + final List lists = TradeManager.getInstance().getBuyListByNpcId(merchant.getNpcId()); if (!player.isGM()) { if (lists == null) @@ -187,12 +187,12 @@ public class RequestBuyItem implements IClientIncomingPacket } else { - list = TradeController.getInstance().getBuyList(_listId); + list = TradeManager.getInstance().getBuyList(_listId); } } else { - list = TradeController.getInstance().getBuyList(_listId); + list = TradeManager.getInstance().getBuyList(_listId); } if (list == null) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java index deddf6f9a9..39f9f5ae83 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java @@ -22,8 +22,8 @@ import java.util.concurrent.Future; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance; @@ -152,7 +152,7 @@ public class RequestWearItem implements IClientIncomingPacket return; } - final List lists = TradeController.getInstance().getBuyListByNpcId(merchant.getNpcId()); + final List lists = TradeManager.getInstance().getBuyListByNpcId(merchant.getNpcId()); if (lists == null) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id.", Config.DEFAULT_PUNISH); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index cf7c054fe3..07ce439e78 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.TradeController; +import org.l2jmobius.gameserver.instancemanager.TradeManager; /** * @author Mobius @@ -82,8 +82,8 @@ public class BuyListTaskManager time = PENDING_UPDATES.get(0); PENDING_UPDATES.remove(time); } - TradeController.getInstance().restoreCount(time.intValue()); - TradeController.getInstance().dataTimerSave(time.intValue()); + TradeManager.getInstance().restoreCount(time.intValue()); + TradeManager.getInstance().dataTimerSave(time.intValue()); } _workingSaves = false;