lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TradeController class is an instance manager.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-05-01 23:47:01 +00:00
parent e1a85ab007
commit 0fede59c14
30 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java
View File

@@ -102,6 +102,7 @@ import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
import org.l2jmobius.gameserver.instancemanager.RecipeManager; import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.instancemanager.ServerRestartManager; import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager; 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.EventManager;
import org.l2jmobius.gameserver.instancemanager.events.PcPoint; import org.l2jmobius.gameserver.instancemanager.events.PcPoint;
import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.instancemanager.games.Lottery;
@@ -256,7 +257,7 @@ public class GameServer
GeoEngine.getInstance(); GeoEngine.getInstance();
Util.printSection("Economy"); Util.printSection("Economy");
TradeController.getInstance(); TradeManager.getInstance();
MultisellData.getInstance(); MultisellData.getInstance();
Util.printSection("Clan Halls"); Util.printSection("Clan Halls");

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
import org.l2jmobius.gameserver.instancemanager.PrecautionaryRestartManager; import org.l2jmobius.gameserver.instancemanager.PrecautionaryRestartManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.olympiad.Olympiad;
@@ -445,7 +446,7 @@ public class Shutdown extends Thread
LOGGER.info("GrandBossManager: All Grand Boss info saved!!"); LOGGER.info("GrandBossManager: All Grand Boss info saved!!");
// Save data CountStore // Save data CountStore
TradeController.getInstance().dataCountStore(); TradeManager.getInstance().dataCountStore();
LOGGER.info("TradeController: All count Item Saved!!"); LOGGER.info("TradeController: All count Item Saved!!");
// Save Olympiad status // Save Olympiad status

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
View File

@@ -29,12 +29,12 @@ import java.util.StringTokenizer;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTable;
import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.data.sql.NpcTable;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropCategory;
import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.DropData;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
@@ -488,7 +488,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{ {
final int tradeListID = Integer.parseInt(args[1]); final int tradeListID = Integer.parseInt(args[1]);
final int itemId = Integer.parseInt(args[2]); 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); final Item item = ItemTable.getInstance().getTemplate(itemId);
if (tradeList.getPriceForItemId(itemId) < 0) if (tradeList.getPriceForItemId(itemId) < 0)
{ {
@@ -531,7 +531,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{ {
final int tradeListID = Integer.parseInt(args[1]); final int tradeListID = Integer.parseInt(args[1]);
final int itemID = Integer.parseInt(args[2]); 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) if (tradeList.getPriceForItemId(itemID) < 0)
{ {
return; return;
@@ -571,7 +571,7 @@ public class AdminEditNpc implements IAdminCommandHandler
private void addShopItem(PlayerInstance activeChar, String[] args) private void addShopItem(PlayerInstance activeChar, String[] args)
{ {
final int tradeListID = Integer.parseInt(args[1]); final int tradeListID = Integer.parseInt(args[1]);
final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID);
if (tradeList == null) if (tradeList == null)
{ {
BuilderUtil.sendSysMessage(activeChar, "TradeList not found!"); BuilderUtil.sendSysMessage(activeChar, "TradeList not found!");
@@ -622,7 +622,7 @@ public class AdminEditNpc implements IAdminCommandHandler
private void showShopList(PlayerInstance activeChar, int tradeListID, int page) 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)) if ((page > ((tradeList.getItems().size() / PAGE_LIMIT) + 1)) || (page < 1))
{ {
return; return;
@@ -798,7 +798,7 @@ public class AdminEditNpc implements IAdminCommandHandler
if (pos >= 0) if (pos >= 0)
{ {
final int tradeListID = Integer.decode(line.substring(pos + target.length() + 1).split("\"")[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));
} }
} }

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java
View File

@@ -20,7 +20,6 @@ import java.util.StringTokenizer;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.enums.ServerMode;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.SkillTable; 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.data.xml.WalkerRouteData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
@@ -118,7 +118,7 @@ public class AdminReload implements IAdminCommandHandler
} }
else if (type.equals("tradelist")) else if (type.equals("tradelist"))
{ {
TradeController.getInstance(); TradeManager.getInstance();
sendReloadPage(activeChar); sendReloadPage(activeChar);
BuilderUtil.sendSysMessage(activeChar, "TradeList Table reloaded."); BuilderUtil.sendSysMessage(activeChar, "TradeList Table reloaded.");
} }

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java
View File

@@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -80,7 +80,7 @@ public class AdminShop implements IAdminCommandHandler
LOGGER.warning("admin buylist failed:" + command); LOGGER.warning("admin buylist failed:" + command);
} }
final StoreTradeList list = TradeController.getInstance().getBuyList(val); final StoreTradeList list = TradeManager.getInstance().getBuyList(val);
if (list != null) if (list != null)
{ {
activeChar.sendPacket(new BuyList(list, activeChar.getAdena())); activeChar.sendPacket(new BuyList(list, activeChar.getAdena()));

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/TradeController.java → L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.l2jmobius.gameserver; package org.l2jmobius.gameserver.instancemanager;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; 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 $ * @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 int _nextListId;
private final Map<Integer, StoreTradeList> _lists; private final Map<Integer, StoreTradeList> _lists;
private final Map<Integer, StoreTradeList> _listsTaskItem; private final Map<Integer, StoreTradeList> _listsTaskItem;
protected TradeController() protected TradeManager()
{ {
boolean limitedItem = false; boolean limitedItem = false;
_lists = new HashMap<>(); _lists = new HashMap<>();
@@ -487,13 +487,13 @@ public class TradeController
return _nextListId++; return _nextListId++;
} }
public static TradeController getInstance() public static TradeManager getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
} }
private static class SingletonHolder private static class SingletonHolder
{ {
protected static final TradeController INSTANCE = new TradeController(); protected static final TradeManager INSTANCE = new TradeManager();
} }
} }

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java
View File

@@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
@@ -287,7 +287,7 @@ public class CastleChamberlainInstance extends FolkInstance
buy = Integer.parseInt(val + "2"); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), 0)); player.sendPacket(new BuyList(list, player.getAdena(), 0));

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
View File

@@ -20,11 +20,11 @@ import java.text.SimpleDateFormat;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTable;
import org.l2jmobius.gameserver.data.sql.TeleportLocationTable; import org.l2jmobius.gameserver.data.sql.TeleportLocationTable;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
@@ -1085,7 +1085,7 @@ public class ClanHallManagerInstance extends FolkInstance
player.tempInvetoryDisable(); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); player.sendPacket(new BuyList(list, player.getAdena(), taxRate));

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
View File

@@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTable;
import org.l2jmobius.gameserver.data.sql.SkillTreeTable; import org.l2jmobius.gameserver.data.sql.SkillTreeTable;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
@@ -63,7 +63,7 @@ public class FishermanInstance extends FolkInstance
taxRate = getCastle().getTaxRate(); taxRate = getCastle().getTaxRate();
} }
player.tempInvetoryDisable(); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); player.sendPacket(new BuyList(list, player.getAdena(), taxRate));

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java
View File

@@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -105,7 +105,7 @@ public class ManorManagerInstance extends MerchantInstance
final double taxRate = 0; final double taxRate = 0;
player.tempInvetoryDisable(); player.tempInvetoryDisable();
final StoreTradeList list = TradeController.getInstance().getBuyList(Integer.parseInt(value)); final StoreTradeList list = TradeManager.getInstance().getBuyList(Integer.parseInt(value));
if (list != null) if (list != null)
{ {
list.getItems().get(0).setCount(1); list.getItems().get(0).setCount(1);

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java
View File

@@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
@@ -115,7 +115,7 @@ public class MercManagerInstance extends FolkInstance
private void showBuyWindow(PlayerInstance player, int value) private void showBuyWindow(PlayerInstance player, int value)
{ {
player.tempInvetoryDisable(); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), 0)); player.sendPacket(new BuyList(list, player.getAdena(), 0));

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
View File

@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.MultisellData;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
@@ -68,7 +68,7 @@ public class MerchantInstance extends FolkInstance
private void showWearWindow(PlayerInstance player, int value) private void showWearWindow(PlayerInstance player, int value)
{ {
player.tempInvetoryDisable(); player.tempInvetoryDisable();
final StoreTradeList list = TradeController.getInstance().getBuyList(value); final StoreTradeList list = TradeManager.getInstance().getBuyList(value);
if (list != null) if (list != null)
{ {
player.sendPacket(new WearList(list, player.getAdena(), player.getExpertiseIndex())); player.sendPacket(new WearList(list, player.getAdena(), player.getExpertiseIndex()));
@@ -95,7 +95,7 @@ public class MerchantInstance extends FolkInstance
player.tempInvetoryDisable(); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); player.sendPacket(new BuyList(list, player.getAdena(), taxRate));

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
View File

@@ -20,9 +20,9 @@ import java.util.List;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.CastleChamberlainInstance; import org.l2jmobius.gameserver.model.actor.instance.CastleChamberlainInstance;
@@ -169,7 +169,7 @@ public class RequestBuyItem implements IClientIncomingPacket
StoreTradeList list = null; StoreTradeList list = null;
if (merchant != null) if (merchant != null)
{ {
final List<StoreTradeList> lists = TradeController.getInstance().getBuyListByNpcId(merchant.getNpcId()); final List<StoreTradeList> lists = TradeManager.getInstance().getBuyListByNpcId(merchant.getNpcId());
if (!player.isGM()) if (!player.isGM())
{ {
if (lists == null) if (lists == null)
@@ -187,12 +187,12 @@ public class RequestBuyItem implements IClientIncomingPacket
} }
else else
{ {
list = TradeController.getInstance().getBuyList(_listId); list = TradeManager.getInstance().getBuyList(_listId);
} }
} }
else else
{ {
list = TradeController.getInstance().getBuyList(_listId); list = TradeManager.getInstance().getBuyList(_listId);
} }
if (list == null) if (list == null)

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java
View File

@@ -22,8 +22,8 @@ import java.util.concurrent.Future;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance;
@@ -152,7 +152,7 @@ public class RequestWearItem implements IClientIncomingPacket
return; return;
} }
final List<StoreTradeList> lists = TradeController.getInstance().getBuyListByNpcId(merchant.getNpcId()); final List<StoreTradeList> lists = TradeManager.getInstance().getBuyListByNpcId(merchant.getNpcId());
if (lists == null) if (lists == null)
{ {
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id.", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id.", Config.DEFAULT_PUNISH);

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java
View File

@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.instancemanager.TradeManager;
/** /**
* @author Mobius * @author Mobius
@@ -82,8 +82,8 @@ public class BuyListTaskManager
time = PENDING_UPDATES.get(0); time = PENDING_UPDATES.get(0);
PENDING_UPDATES.remove(time); PENDING_UPDATES.remove(time);
} }
TradeController.getInstance().restoreCount(time.intValue()); TradeManager.getInstance().restoreCount(time.intValue());
TradeController.getInstance().dataTimerSave(time.intValue()); TradeManager.getInstance().dataTimerSave(time.intValue());
} }
_workingSaves = false; _workingSaves = false;

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
View File

@@ -106,6 +106,7 @@ import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
import org.l2jmobius.gameserver.instancemanager.RecipeManager; import org.l2jmobius.gameserver.instancemanager.RecipeManager;
import org.l2jmobius.gameserver.instancemanager.ServerRestartManager; import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager; 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.EventManager;
import org.l2jmobius.gameserver.instancemanager.events.PcPoint; import org.l2jmobius.gameserver.instancemanager.events.PcPoint;
import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.instancemanager.games.Lottery;
@@ -261,7 +262,7 @@ public class GameServer
GeoEngine.getInstance(); GeoEngine.getInstance();
Util.printSection("Economy"); Util.printSection("Economy");
TradeController.getInstance(); TradeManager.getInstance();
MultisellData.getInstance(); MultisellData.getInstance();
Util.printSection("Clan Halls"); Util.printSection("Clan Halls");

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
View File

@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
import org.l2jmobius.gameserver.instancemanager.PrecautionaryRestartManager; import org.l2jmobius.gameserver.instancemanager.PrecautionaryRestartManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.olympiad.Olympiad;
@@ -447,7 +448,7 @@ public class Shutdown extends Thread
LOGGER.info("GrandBossManager: All Grand Boss info saved!!"); LOGGER.info("GrandBossManager: All Grand Boss info saved!!");
// Save data CountStore // Save data CountStore
TradeController.getInstance().dataCountStore(); TradeManager.getInstance().dataCountStore();
LOGGER.info("TradeController: All count Item Saved!!"); LOGGER.info("TradeController: All count Item Saved!!");
// Save Olympiad status // Save Olympiad status

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
View File

@@ -29,12 +29,12 @@ import java.util.StringTokenizer;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTable;
import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.data.sql.NpcTable;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropCategory;
import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.DropData;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
@@ -488,7 +488,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{ {
final int tradeListID = Integer.parseInt(args[1]); final int tradeListID = Integer.parseInt(args[1]);
final int itemId = Integer.parseInt(args[2]); 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); final Item item = ItemTable.getInstance().getTemplate(itemId);
if (tradeList.getPriceForItemId(itemId) < 0) if (tradeList.getPriceForItemId(itemId) < 0)
{ {
@@ -531,7 +531,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{ {
final int tradeListID = Integer.parseInt(args[1]); final int tradeListID = Integer.parseInt(args[1]);
final int itemID = Integer.parseInt(args[2]); 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) if (tradeList.getPriceForItemId(itemID) < 0)
{ {
return; return;
@@ -571,7 +571,7 @@ public class AdminEditNpc implements IAdminCommandHandler
private void addShopItem(PlayerInstance activeChar, String[] args) private void addShopItem(PlayerInstance activeChar, String[] args)
{ {
final int tradeListID = Integer.parseInt(args[1]); final int tradeListID = Integer.parseInt(args[1]);
final StoreTradeList tradeList = TradeController.getInstance().getBuyList(tradeListID); final StoreTradeList tradeList = TradeManager.getInstance().getBuyList(tradeListID);
if (tradeList == null) if (tradeList == null)
{ {
BuilderUtil.sendSysMessage(activeChar, "TradeList not found!"); BuilderUtil.sendSysMessage(activeChar, "TradeList not found!");
@@ -622,7 +622,7 @@ public class AdminEditNpc implements IAdminCommandHandler
private void showShopList(PlayerInstance activeChar, int tradeListID, int page) 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)) if ((page > ((tradeList.getItems().size() / PAGE_LIMIT) + 1)) || (page < 1))
{ {
return; return;
@@ -798,7 +798,7 @@ public class AdminEditNpc implements IAdminCommandHandler
if (pos >= 0) if (pos >= 0)
{ {
final int tradeListID = Integer.decode(line.substring(pos + target.length() + 1).split("\"")[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));
} }
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java
View File

@@ -20,7 +20,6 @@ import java.util.StringTokenizer;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.enums.ServerMode;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.SkillTable; 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.data.xml.WalkerRouteData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.util.BuilderUtil; import org.l2jmobius.gameserver.util.BuilderUtil;
@@ -118,7 +118,7 @@ public class AdminReload implements IAdminCommandHandler
} }
else if (type.equals("tradelist")) else if (type.equals("tradelist"))
{ {
TradeController.getInstance(); TradeManager.getInstance();
sendReloadPage(activeChar); sendReloadPage(activeChar);
BuilderUtil.sendSysMessage(activeChar, "TradeList Table reloaded."); BuilderUtil.sendSysMessage(activeChar, "TradeList Table reloaded.");
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java
View File

@@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -80,7 +80,7 @@ public class AdminShop implements IAdminCommandHandler
LOGGER.warning("admin buylist failed:" + command); LOGGER.warning("admin buylist failed:" + command);
} }
final StoreTradeList list = TradeController.getInstance().getBuyList(val); final StoreTradeList list = TradeManager.getInstance().getBuyList(val);
if (list != null) if (list != null)
{ {
activeChar.sendPacket(new BuyList(list, activeChar.getAdena())); activeChar.sendPacket(new BuyList(list, activeChar.getAdena()));

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.l2jmobius.gameserver; package org.l2jmobius.gameserver.instancemanager;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; 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 $ * @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 int _nextListId;
private final Map<Integer, StoreTradeList> _lists; private final Map<Integer, StoreTradeList> _lists;
private final Map<Integer, StoreTradeList> _listsTaskItem; private final Map<Integer, StoreTradeList> _listsTaskItem;
protected TradeController() protected TradeManager()
{ {
boolean limitedItem = false; boolean limitedItem = false;
_lists = new HashMap<>(); _lists = new HashMap<>();
@@ -487,13 +487,13 @@ public class TradeController
return _nextListId++; return _nextListId++;
} }
public static TradeController getInstance() public static TradeManager getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
} }
private static class SingletonHolder private static class SingletonHolder
{ {
protected static final TradeController INSTANCE = new TradeController(); protected static final TradeManager INSTANCE = new TradeManager();
} }
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java
View File

@@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
@@ -287,7 +287,7 @@ public class CastleChamberlainInstance extends FolkInstance
buy = Integer.parseInt(val + "2"); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), 0)); player.sendPacket(new BuyList(list, player.getAdena(), 0));

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
View File

@@ -20,11 +20,11 @@ import java.text.SimpleDateFormat;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTable;
import org.l2jmobius.gameserver.data.sql.TeleportLocationTable; import org.l2jmobius.gameserver.data.sql.TeleportLocationTable;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
@@ -1085,7 +1085,7 @@ public class ClanHallManagerInstance extends FolkInstance
player.tempInvetoryDisable(); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); player.sendPacket(new BuyList(list, player.getAdena(), taxRate));

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
View File

@@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTable;
import org.l2jmobius.gameserver.data.sql.SkillTreeTable; import org.l2jmobius.gameserver.data.sql.SkillTreeTable;
import org.l2jmobius.gameserver.instancemanager.FishingChampionshipManager; import org.l2jmobius.gameserver.instancemanager.FishingChampionshipManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
@@ -65,7 +65,7 @@ public class FishermanInstance extends FolkInstance
taxRate = getCastle().getTaxRate(); taxRate = getCastle().getTaxRate();
} }
player.tempInvetoryDisable(); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); player.sendPacket(new BuyList(list, player.getAdena(), taxRate));

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java
View File

@@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -105,7 +105,7 @@ public class ManorManagerInstance extends MerchantInstance
final double taxRate = 0; final double taxRate = 0;
player.tempInvetoryDisable(); player.tempInvetoryDisable();
final StoreTradeList list = TradeController.getInstance().getBuyList(Integer.parseInt(value)); final StoreTradeList list = TradeManager.getInstance().getBuyList(Integer.parseInt(value));
if (list != null) if (list != null)
{ {
list.getItems().get(0).setCount(1); list.getItems().get(0).setCount(1);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MercManagerInstance.java
View File

@@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
@@ -115,7 +115,7 @@ public class MercManagerInstance extends FolkInstance
private void showBuyWindow(PlayerInstance player, int value) private void showBuyWindow(PlayerInstance player, int value)
{ {
player.tempInvetoryDisable(); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), 0)); player.sendPacket(new BuyList(list, player.getAdena(), 0));

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
View File

@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.MultisellData;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
@@ -68,7 +68,7 @@ public class MerchantInstance extends FolkInstance
private void showWearWindow(PlayerInstance player, int value) private void showWearWindow(PlayerInstance player, int value)
{ {
player.tempInvetoryDisable(); player.tempInvetoryDisable();
final StoreTradeList list = TradeController.getInstance().getBuyList(value); final StoreTradeList list = TradeManager.getInstance().getBuyList(value);
if (list != null) if (list != null)
{ {
player.sendPacket(new WearList(list, player.getAdena(), player.getExpertiseIndex())); player.sendPacket(new WearList(list, player.getAdena(), player.getExpertiseIndex()));
@@ -95,7 +95,7 @@ public class MerchantInstance extends FolkInstance
player.tempInvetoryDisable(); 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()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
player.sendPacket(new BuyList(list, player.getAdena(), taxRate)); player.sendPacket(new BuyList(list, player.getAdena(), taxRate));

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
View File

@@ -20,9 +20,9 @@ import java.util.List;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.CastleChamberlainInstance; import org.l2jmobius.gameserver.model.actor.instance.CastleChamberlainInstance;
@@ -169,7 +169,7 @@ public class RequestBuyItem implements IClientIncomingPacket
StoreTradeList list = null; StoreTradeList list = null;
if (merchant != null) if (merchant != null)
{ {
final List<StoreTradeList> lists = TradeController.getInstance().getBuyListByNpcId(merchant.getNpcId()); final List<StoreTradeList> lists = TradeManager.getInstance().getBuyListByNpcId(merchant.getNpcId());
if (!player.isGM()) if (!player.isGM())
{ {
if (lists == null) if (lists == null)
@@ -187,12 +187,12 @@ public class RequestBuyItem implements IClientIncomingPacket
} }
else else
{ {
list = TradeController.getInstance().getBuyList(_listId); list = TradeManager.getInstance().getBuyList(_listId);
} }
} }
else else
{ {
list = TradeController.getInstance().getBuyList(_listId); list = TradeManager.getInstance().getBuyList(_listId);
} }
if (list == null) if (list == null)

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java
View File

@@ -22,8 +22,8 @@ import java.util.concurrent.Future;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.TradeManager;
import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance;
@@ -152,7 +152,7 @@ public class RequestWearItem implements IClientIncomingPacket
return; return;
} }
final List<StoreTradeList> lists = TradeController.getInstance().getBuyListByNpcId(merchant.getNpcId()); final List<StoreTradeList> lists = TradeManager.getInstance().getBuyListByNpcId(merchant.getNpcId());
if (lists == null) if (lists == null)
{ {
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id.", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id.", Config.DEFAULT_PUNISH);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java
View File

@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.instancemanager.TradeManager;
/** /**
* @author Mobius * @author Mobius
@@ -82,8 +82,8 @@ public class BuyListTaskManager
time = PENDING_UPDATES.get(0); time = PENDING_UPDATES.get(0);
PENDING_UPDATES.remove(time); PENDING_UPDATES.remove(time);
} }
TradeController.getInstance().restoreCount(time.intValue()); TradeManager.getInstance().restoreCount(time.intValue());
TradeController.getInstance().dataTimerSave(time.intValue()); TradeManager.getInstance().dataTimerSave(time.intValue());
} }
_workingSaves = false; _workingSaves = false;