Changeset 993

(2010/02/08 00:56) About 2 years ago

Warehouse implemented. Thanks kosyachok. Some advanced features of WH will be done later.
Update DB with sql query (inventory-rev993.sql).

Affected files

trunk/AE-go_GameServer/data/scripts/system/database/mysql5/MySQL5InventoryDAO.java Download diff

 import com.aionemu.gameserver.dao.InventoryDAO;
 import com.aionemu.gameserver.model.gameobjects.Item;
 import com.aionemu.gameserver.model.gameobjects.PersistentState;
-import com.aionemu.gameserver.model.gameobjects.player.Inventory;
+import com.aionemu.gameserver.model.gameobjects.player.Storage;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
+import com.aionemu.gameserver.model.gameobjects.player.StorageType;
+import java.util.ArrayList;
 /**
  * @author ATracer
  */
 public class MySQL5InventoryDAO extends InventoryDAO
 {
-    private static final Logger log = Logger.getLogger(MySQL5InventoryDAO.class);
+	private static final Logger log = Logger.getLogger(MySQL5InventoryDAO.class);
-    public static final String SELECT_QUERY = "SELECT `itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `isEquiped`, `slot` FROM `inventory` WHERE `itemOwner`=?";
+	public static final String SELECT_QUERY = "SELECT `itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `isEquiped`, `slot` FROM `inventory` WHERE `itemOwner`=? AND `itemLocation`=?";
-    public static final String INSERT_QUERY = "INSERT INTO `inventory` (`itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `itemOwner`, `isEquiped`, `slot`) VALUES(?,?,?,?,?,?,?)";
+	public static final String INSERT_QUERY = "INSERT INTO `inventory` (`itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `itemOwner`, `isEquiped`, `slot`, `itemLocation`) VALUES(?,?,?,?,?,?,?,?)";
-    public static final String UPDATE_QUERY = "UPDATE inventory SET  itemCount=?, itemColor=?, itemOwner=?, isEquiped=?, slot=? WHERE itemUniqueId=?";
+	public static final String UPDATE_QUERY = "UPDATE inventory SET  itemCount=?, itemColor=?, itemOwner=?, isEquiped=?, slot=?, itemLocation=? WHERE itemUniqueId=?";
-    public static final String DELETE_QUERY = "DELETE FROM inventory WHERE itemUniqueId=?";
+	public static final String DELETE_QUERY = "DELETE FROM inventory WHERE itemUniqueId=?";
+	public static final String SELECT_ACCOUNT_QUERY = "SELECT `account_id` FROM `players` WHERE `id`=?";
-    @Override
+	@Override
-    public Inventory load(Player player)
+	public Storage load(Player player, StorageType storageType)
-    {
+	{
-        //TODO load parts - cube, equipment etc.
+		//TODO load parts - cube, equipment etc.
-        final Inventory inventory = new Inventory(player);
+		final Storage inventory = new Storage(player, storageType);
-        final int playerId = player.getObjectId();
+		int playerId = player.getObjectId();
+		final int storage = storageType.getId();
-        DB.select(SELECT_QUERY, new ParamReadStH()
+		if(storageType == StorageType.ACCOUNT_WAREHOUSE)
-        {
+		{
-            @Override
+			playerId = getPlayerAccountId(playerId);
-            public void setParams(PreparedStatement stmt) throws SQLException
+		}
-            {
-                stmt.setInt(1, playerId);
-            }
-            @Override
+		final int owner = playerId;
-            public void handleRead(ResultSet rset) throws SQLException
-            {
-                while(rset.next())
-                {
-                    int itemUniqueId = rset.getInt("itemUniqueId");
-                    int itemId = rset.getInt("itemId");
-                    int itemCount = rset.getInt("itemCount");
-                    int itemColor = rset.getInt("itemColor");
-                    int isEquiped = rset.getInt("isEquiped");
-                    int slot = rset.getInt("slot");
-                    Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, isEquiped == 1, slot);
-                    item.setPersistentState(PersistentState.UPDATED);
-                    inventory.onLoadHandler(item);
-                }
-            }
-        });
-        return inventory;
-    }
-    @Override
+		DB.select(SELECT_QUERY, new ParamReadStH()
-    public boolean store(Inventory inventory)
+		{
-    {
-        int playerId = inventory.getOwner().getObjectId();
-        List<Item> inventoryItems = inventory.getAllItems();
-        boolean resultSuccess = true;
-        for(Item item : inventoryItems)
-        {
-        	resultSuccess = store(item, playerId);
-        }
-        return resultSuccess;
-    }
-    /**
-     * @param item
-     * @param playerId
-     * @return
-     */
-    @Override
-	public boolean store(final Item item, final int playerId)
-    {
-    	boolean result = false;
-    	switch(item.getPersistentState())
-    	{
-    		case NEW:
-    			result = insertItem(item, playerId);
-    			break;
-    		case UPDATE_REQUIRED:
-    			result = updateItem(item, playerId);
-    			break;
-    		case DELETED:
-    			result = deleteItem(item);
-    			break;
-    	}
-    	item.setPersistentState(PersistentState.UPDATED);
-    	return result;
-    }
-    /**
-     * @param item
-     * @param playerId
-     * @return
-     */
-    private boolean insertItem(final Item item, final int playerId)
-    {
-    	return DB.insertUpdate(INSERT_QUERY, new IUStH() {
 			@Override
+			public void setParams(PreparedStatement stmt) throws SQLException
+			{
+				stmt.setInt(1, owner);
+				stmt.setInt(2, storage);
+			}
+			@Override
+			public void handleRead(ResultSet rset) throws SQLException
+			{
+				while(rset.next())
+				{
+					int itemUniqueId = rset.getInt("itemUniqueId");
+					int itemId = rset.getInt("itemId");
+					int itemCount = rset.getInt("itemCount");
+					int itemColor = rset.getInt("itemColor");
+					int isEquiped = rset.getInt("isEquiped");
+					int slot = rset.getInt("slot");
+					Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, isEquiped == 1, slot);
+					item.setPersistentState(PersistentState.UPDATED);
+					inventory.onLoadHandler(item);
+				}
+			}
+		});
+		return inventory;
+	}
+	public int getPlayerAccountId(final int playerId)
+	{
+		final List<Integer> owner = new ArrayList<Integer>();
+		DB.select(SELECT_ACCOUNT_QUERY, new ParamReadStH()
+		{
+			@Override
+			public void setParams(PreparedStatement stmt) throws SQLException
+			{
+				stmt.setInt(1, playerId);
+			}
+			@Override
+			public void handleRead(ResultSet rset) throws SQLException
+			{
+				while(rset.next())
+				{
+					owner.add(rset.getInt("account_id"));
+				}
+			}
+		});
+		return owner.get(0);
+	}
+	@Override
+	public boolean store(Player player)
+	{
+		int playerId = player.getObjectId();
+		List<Item> allPlayerItems = new ArrayList<Item>();
+		allPlayerItems.addAll(player.getStorage(StorageType.CUBE.getId()).getStorageItems());
+		allPlayerItems.addAll(player.getStorage(StorageType.REGULAR_WAREHOUSE.getId()).getStorageItems());
+		allPlayerItems.addAll(player.getStorage(StorageType.ACCOUNT_WAREHOUSE.getId()).getStorageItems());
+		allPlayerItems.addAll(player.getInventory().getEquippedItems());
+		boolean resultSuccess = true;
+		for(Item item : allPlayerItems)
+		{
+			resultSuccess = store(item, playerId);
+		}
+		return resultSuccess;
+	}
+	/**
+	 * @param item
+	 * @param playerId
+	 * @return
+	 */
+	@Override
+	public boolean store(final Item item, int playerId)
+	{
+		boolean result = false;
+		if(item.getItemLocation() == StorageType.ACCOUNT_WAREHOUSE.getId())
+		{
+			playerId = getPlayerAccountId(playerId);
+		}
+		switch(item.getPersistentState())
+		{
+			case NEW:
+				result = insertItem(item, playerId);
+				break;
+			case UPDATE_REQUIRED:
+				result = updateItem(item, playerId);
+				break;
+			case DELETED:
+				result = deleteItem(item);
+				break;
+		}
+		item.setPersistentState(PersistentState.UPDATED);
+		return result;
+	}
+	/**
+	 * @param item
+	 * @param playerId
+	 * @return
+	 */
+	private boolean insertItem(final Item item, final int playerId)
+	{
+		return DB.insertUpdate(INSERT_QUERY, new IUStH() {
+			@Override
 			public void handleInsertUpdate(PreparedStatement stmt) throws SQLException
 			{
 				stmt.setInt(1, item.getObjectId());
 				stmt.setInt(5, playerId);
 				stmt.setBoolean(6, item.isEquipped());
 				stmt.setInt(7, item.getEquipmentSlot());
+				stmt.setInt(8, item.getItemLocation());
 				stmt.execute();
 			}
 		});
-    }
+	}
-    /**
+	/**
-     * @param item
+	 * @param item
-     * @return
+	 * @return
-     */
+	 */
-    private boolean updateItem(final Item item,  final int playerId)
+	private boolean updateItem(final Item item,  final int playerId)
-    {
+	{
-    	return DB.insertUpdate(UPDATE_QUERY, new IUStH() {
+		return DB.insertUpdate(UPDATE_QUERY, new IUStH() {
 			@Override
 			public void handleInsertUpdate(PreparedStatement stmt) throws SQLException
 			{
 				stmt.setInt(3, playerId);
 				stmt.setBoolean(4, item.isEquipped());
 				stmt.setInt(5, item.getEquipmentSlot());
-				stmt.setInt(6, item.getObjectId());
+				stmt.setInt(6, item.getItemLocation());
+				stmt.setInt(7, item.getObjectId());
 				stmt.execute();
 			}
 		});
-    }
+	}
-    /**
+	/**
-     *
+	 *
-     * @param item
+	 * @param item
-     */
+	 */
-    private boolean deleteItem(final Item item)
+	private boolean deleteItem(final Item item)
-    {
+	{
-    	return DB.insertUpdate(DELETE_QUERY, new IUStH() {
+		return DB.insertUpdate(DELETE_QUERY, new IUStH() {
 			@Override
 			public void handleInsertUpdate(PreparedStatement stmt) throws SQLException
 			{
 				stmt.execute();
 			}
 		});
-    }
+	}
-    @Override
+	@Override
-    public int[] getUsedIDs()
+	public int[] getUsedIDs()
-    {
+	{
-        PreparedStatement statement = DB.prepareStatement("SELECT itemUniqueId FROM inventory", ResultSet.TYPE_SCROLL_INSENSITIVE,
+		PreparedStatement statement = DB.prepareStatement("SELECT itemUniqueId FROM inventory", ResultSet.TYPE_SCROLL_INSENSITIVE,
-                ResultSet.CONCUR_READ_ONLY);
+			ResultSet.CONCUR_READ_ONLY);
-        try
+		try
-        {
+		{
-            ResultSet rs = statement.executeQuery();
+			ResultSet rs = statement.executeQuery();
-            rs.last();
+			rs.last();
-            int count = rs.getRow();
+			int count = rs.getRow();
-            rs.beforeFirst();
+			rs.beforeFirst();
-            int[] ids = new int[count];
+			int[] ids = new int[count];
-            for(int i = 0; i < count; i++)
+			for(int i = 0; i < count; i++)
-            {
+			{
-                rs.next();
+				rs.next();
-                ids[i] = rs.getInt("itemUniqueId");
+				ids[i] = rs.getInt("itemUniqueId");
-            }
+			}
-            return ids;
+			return ids;
-        }
+		}
-        catch(SQLException e)
+		catch(SQLException e)
-        {
+		{
-            log.error("Can't get list of id's from inventory table", e);
+			log.error("Can't get list of id's from inventory table", e);
-        }
+		}
-        finally
+		finally
-        {
+		{
-            DB.close(statement);
+			DB.close(statement);
-        }
+		}
-        return new int[0];
+		return new int[0];
-    }
+	}
-    /**
+	/**
-     * {@inheritDoc}
+	 * {@inheritDoc}
-     */
+	 */
-    @Override
+	@Override
-    public boolean supports(String s, int i, int i1)
+	public boolean supports(String s, int i, int i1)
-    {
+	{
-        return MySQL5DAOUtils.supports(s, i, i1);
+		return MySQL5DAOUtils.supports(s, i, i1);
-    }
+	}
 }

trunk/AE-go_GameServer/data/scripts/system/handlers/admincommands/Add.java Download diff

trunk/AE-go_GameServer/sql/Update/inventory-rev993.sql

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/dao/InventoryDAO.java Download diff

 package com.aionemu.gameserver.dao;
 import com.aionemu.gameserver.model.gameobjects.Item;
-import com.aionemu.gameserver.model.gameobjects.player.Inventory;
+import com.aionemu.gameserver.model.gameobjects.player.Storage;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
+import com.aionemu.gameserver.model.gameobjects.player.StorageType;
 /**
  * @author ATracer
 	 * @param player
 	 * @return
 	 */
-	public abstract Inventory load(Player player);
+	public abstract Storage load(Player player, StorageType storageType);
 	/**
 	 * @param inventory
 	 */
-	public abstract boolean store(Inventory inventory);
+	public abstract boolean store(Player player);
 	/**
 	 * @param item
 	 */
 	public abstract boolean store(Item item, int playerId);
 	@Override
 	public String getClassName()
 	{

trunk/AE-go_GameServer/src/com/aionemu/gameserver/itemengine/actions/SkillLearnAction.java Download diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/account/PlayerAccountData.java Download diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/Item.java Download diff

 public class Item extends AionObject
 {
 	private int itemCount = 1;
 	private int itemColor = 0;
 	private ItemTemplate itemTemplate;
 	private boolean isEquipped = false;
 	private int equipmentSlot = 0;
 	private boolean isQuest;
 	private PersistentState persistentState;
 	//TODO move to ItemStoneList ?
 	private List<ItemStone> itemStones;
+	private int itemLocation;
 	/**
 	 * @param objId
 	 * @param itemTemplate
 	public Item(int objId, ItemTemplate itemTemplate, int itemCount, boolean isEquipped, int equipmentSlot)
 	{
 		super(objId);
 		this.itemTemplate = itemTemplate;
 		this.itemCount = itemCount;
 		this.isEquipped = isEquipped;
 		this.equipmentSlot = equipmentSlot;
 		this.persistentState = PersistentState.NEW;
 	}
 	/**
 	 * @param objId
 	 * @param itemId
 	public Item(int objId, int itemId, int itemCount, int itemColor, boolean isEquipped, int equipmentSlot)
 	{
 		super(objId);
 		this.itemTemplate = DataManager.ITEM_DATA.getItemTemplate(itemId);
 		this.itemCount = itemCount;
 		this.itemColor = itemColor;
 	/**
 	 *@return the itemColor
-     */
+	 */
 	public int getItemColor()
 	{
 		return itemColor;
 		this.itemCount = itemCount;
 		setPersistentState(PersistentState.UPDATE_REQUIRED);
 	}
 	/**
 	 *  Every increase operation should be persisted immediately in caller method
 	 *  Use <code>setItemCount</code> method for non-persisted operations
 		int nextSlot = itemStones == null ? 0 : itemStones.size();
 		if(itemStones == null)
 			itemStones = new ArrayList<ItemStone>();
 		ItemStone stone = new ItemStone(getObjectId(), itemId,
 			nextSlot, PersistentState.NEW);
 		this.itemStones.add(stone);
 			default:
 				this.persistentState = persistentState;
 		}
 	}
 	/**
 		sb.append('}');
 		return sb.toString();
 	}
+	public void setItemLocation(int storageType)
+	{
+		this.itemLocation = storageType;
+	}
+	public int getItemLocation()
+	{
+		return itemLocation;
+	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/Player.java Download diff

	992		993
18		18
19	import java.util.ArrayList;	19	import java.util.ArrayList;
20	import java.util.List;	20	import java.util.List;
		21	import java.util.SortedMap;
		22	import java.util.TreeMap;
		23	import java.util.Collections;
21		24
22	import com.aionemu.commons.callbacks.Enhancable;	25	import com.aionemu.commons.callbacks.Enhancable;
23	import com.aionemu.gameserver.controllers.PlayerController;	26	import com.aionemu.gameserver.controllers.PlayerController;
...		...
28	import com.aionemu.gameserver.model.gameobjects.VisibleObject;	31	import com.aionemu.gameserver.model.gameobjects.VisibleObject;
29	import com.aionemu.gameserver.model.gameobjects.player.listeners.PlayerLoggedInListener;	32	import com.aionemu.gameserver.model.gameobjects.player.listeners.PlayerLoggedInListener;
30	import com.aionemu.gameserver.model.gameobjects.player.listeners.PlayerLoggedOutListener;	33	import com.aionemu.gameserver.model.gameobjects.player.listeners.PlayerLoggedOutListener;
		34	import com.aionemu.gameserver.model.gameobjects.Item;
31	import com.aionemu.gameserver.model.gameobjects.stats.PlayerGameStats;	35	import com.aionemu.gameserver.model.gameobjects.stats.PlayerGameStats;
32	import com.aionemu.gameserver.model.gameobjects.stats.PlayerLifeStats;	36	import com.aionemu.gameserver.model.gameobjects.stats.PlayerLifeStats;
33	import com.aionemu.gameserver.model.group.PlayerGroup;	37	import com.aionemu.gameserver.model.group.PlayerGroup;
...		...
60	private BlockList blockList;	64	private BlockList blockList;
61	private ResponseRequester requester;	65	private ResponseRequester requester;
62	private boolean lookingForGroup = false;	66	private boolean lookingForGroup = false;
63	private Inventory inventory;	67	private Storage inventory;
		68	private Storage regularWarehouse;
		69	private Storage accountWarehouse;
		70	private SortedMap<Integer, Item> equipment = Collections.synchronizedSortedMap(new TreeMap<Integer, Item>());
64	private PlayerStore store;	71	private PlayerStore store;
65	private PlayerStatsTemplate playerStatsTemplate;	72	private PlayerStatsTemplate playerStatsTemplate;
66	private TitleList titleList;	73	private TitleList titleList;
...		...
305	/**	312	/**
306	* @return the inventory	313	* @return the inventory
307	*/	314	*/
308	public Inventory getInventory()	315
		316	public SortedMap<Integer, Item> getEquipment()
309	{	317	{
310	return inventory;	318	return equipment;
311	}	319	}
312		320
313	/**	321	/**
...		...
373	QuestEnv env = new QuestEnv(obj, this, questId, 0);	381	QuestEnv env = new QuestEnv(obj, this, questId, 0);
374	if (QuestEngine.getInstance().getQuest(env).checkStartCondition())	382	if (QuestEngine.getInstance().getQuest(env).checkStartCondition())
375	{	383	{
376	if (!nearbyQuestList.contains(questId))	384	if (!nearbyQuestList.contains(questId))
377	{	385	{
378	nearbyQuestList.add(questId);	386	nearbyQuestList.add(questId);
379	}	387	}
380	}	388	}
381	}	389	}
382	}	390	}
...		...
393	* @param inventory	401	* @param inventory
394	* the inventory to set Inventory should be set right after player object is created	402	* the inventory to set Inventory should be set right after player object is created
395	*/	403	*/
396	public void setInventory(Inventory inventory)	404	public void setStorage(Storage storage, StorageType storageType)
397	{	405	{
398	this.inventory = inventory;	406	if(storageType == StorageType.CUBE)
399	inventory.setOwner(this);	407	{
400	}	408	this.inventory = storage;
		409	inventory.setOwner(this);
		410	}
401		411
402	/**	412	if(storageType == StorageType.REGULAR_WAREHOUSE)
403	* @param CubeUpgrade	413	{
404	* int Sets the cubesize	414	this.regularWarehouse = storage;
405	*/	415	regularWarehouse.setOwner(this);
406	public void setCubesize(int cubesize)	416	}
407	{
408	this.playerCommonData.setCubesize(cubesize);
409	}
410		417
411	/**	418	if(storageType == StorageType.ACCOUNT_WAREHOUSE)
412	* @return the playerSettings	419	{
413	*/	420	this.accountWarehouse = storage;
414	public PlayerSettings getPlayerSettings()	421	accountWarehouse.setOwner(this);
415	{	422	}
416	return playerSettings;
417	}
418		423
419	/**
420	* @param playerSettings the playerSettings to set
421	*/
422	public void setPlayerSettings(PlayerSettings playerSettings)
423	{
424	this.playerSettings = playerSettings;
425	}	424	}
426		425
427	/**	426	public Storage getStorage(int storageType)
428	* @return the zoneInstance
429	*/
430	public ZoneInstance getZoneInstance()
431	{	427	{
432	return zoneInstance;	428	if(storageType == StorageType.REGULAR_WAREHOUSE.getId())
433	}	429	return regularWarehouse;
434		430
435	/**	431	if(storageType == StorageType.ACCOUNT_WAREHOUSE.getId())
436	* @param zoneInstance the zoneInstance to set	432	return accountWarehouse;
437	*/
438	public void setZoneInstance(ZoneInstance zoneInstance)
439	{
440	this.zoneInstance = zoneInstance;
441	}
442		433
443	public TitleList getTitleList()	434	if(storageType == StorageType.CUBE.getId())
444	{	435	return inventory;
445	return titleList;	436	else
		437	return null;
446	}	438	}
447
448	public void setTitleList(TitleList titleList)
449	{
450	this.titleList = titleList;
451	titleList.setOwner(this);
452	}
453		439
454	/**	440	public Storage getInventory()
455	* @return the playerGroup
456	*/
457	public PlayerGroup getPlayerGroup()
458	{	441	{
459	return playerGroup;	442	return inventory;
460	}	443	}
461		444
462	/**	445	/**
463	* @param playerGroup the playerGroup to set	446	* @param CubeUpgrade
		447	* int Sets the cubesize
464	*/	448	*/
465	public void setPlayerGroup(PlayerGroup playerGroup)	449	public void setCubesize(int cubesize)
466	{	450	{
467	this.playerGroup = playerGroup;	451	this.playerCommonData.setCubesize(cubesize);
468	}	452	}
469		453
470	@Override	454	/**
471	public void initializeAi()	455	* @return the playerSettings
472	{	456	*/
473	// TODO Auto-generated method stub	457	public PlayerSettings getPlayerSettings()
474	}	458	{
		459	return playerSettings;
		460	}
475		461
476	/**	462	/**
477	* This method is called when player logs into the game. It's main responsibility is to call all registered	463	* @param playerSettings the playerSettings to set
478	* listeners.<br>	464	*/
479	* <br>	465	public void setPlayerSettings(PlayerSettings playerSettings)
480	*	466	{
481	* <b><font color='red'>NOTICE: </font>this method is supposed to be called only from	467	this.playerSettings = playerSettings;
482	* {@link PlayerService#playerLoggedIn(Player)}</b>	468	}
483	*/
484	@Enhancable(callback = PlayerLoggedInListener.class)
485	public void onLoggedIn()
486	{
487		469
488	}	470	/**
		471	* @return the zoneInstance
		472	*/
		473	public ZoneInstance getZoneInstance()
		474	{
		475	return zoneInstance;
		476	}
489		477
490	/**	478	/**
491	* This method is called when player leaves the game. It's main responsibility is to call all registered listeners.<br>	479	* @param zoneInstance the zoneInstance to set
492	* <br>	480	*/
493	*	481	public void setZoneInstance(ZoneInstance zoneInstance)
494	* <b><font color='red'>NOTICE: </font>this method is supposed to be called only from	482	{
495	* {@link PlayerService#playerLoggedOut(Player)}</b>	483	this.zoneInstance = zoneInstance;
496	*/	484	}
497	@Enhancable(callback = PlayerLoggedOutListener.class)
498	public void onLoggedOut()
499	{
500		485
501	}	486	public TitleList getTitleList()
		487	{
		488	return titleList;
		489	}
		490
		491	public void setTitleList(TitleList titleList)
		492	{
		493	this.titleList = titleList;
		494	titleList.setOwner(this);
		495	}
		496
		497	/**
		498	* @return the playerGroup
		499	*/
		500	public PlayerGroup getPlayerGroup()
		501	{
		502	return playerGroup;
		503	}
		504
		505	/**
		506	* @param playerGroup the playerGroup to set
		507	*/
		508	public void setPlayerGroup(PlayerGroup playerGroup)
		509	{
		510	this.playerGroup = playerGroup;
		511	}
		512
		513	@Override
		514	public void initializeAi()
		515	{
		516	// TODO Auto-generated method stub
		517	}
		518
		519	/**
		520	* This method is called when player logs into the game. It's main responsibility is to call all registered
		521	* listeners.<br>
		522	* <br>
		523	*
		524	* <b><font color='red'>NOTICE: </font>this method is supposed to be called only from
		525	* {@link PlayerService#playerLoggedIn(Player)}</b>
		526	*/
		527	@Enhancable(callback = PlayerLoggedInListener.class)
		528	public void onLoggedIn()
		529	{
		530
		531	}
		532
		533	/**
		534	* This method is called when player leaves the game. It's main responsibility is to call all registered listeners.<br>
		535	* <br>
		536	*
		537	* <b><font color='red'>NOTICE: </font>this method is supposed to be called only from
		538	* {@link PlayerService#playerLoggedOut(Player)}</b>
		539	*/
		540	@Enhancable(callback = PlayerLoggedOutListener.class)
		541	public void onLoggedOut()
		542	{
		543
		544	}
502	}	545	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/Storage.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/StorageType.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_DELETE_ITEM.java Download diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_DIALOG_SELECT.java Download diff

 import com.aionemu.gameserver.model.gameobjects.Npc;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.RequestResponseHandler;
+import com.aionemu.gameserver.model.gameobjects.player.StorageType;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_DIALOG_WINDOW;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_MESSAGE;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_SYSTEM_MESSAGE;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_TELEPORT_MAP;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_TRADELIST;
+import com.aionemu.gameserver.network.aion.serverpackets.SM_WAREHOUSE_INFO;
 import com.aionemu.gameserver.questEngine.QuestEngine;
 import com.aionemu.gameserver.questEngine.model.QuestEnv;
 import com.aionemu.gameserver.services.ClassChangeService;
 import com.aionemu.gameserver.services.CubeExpandService;
 import com.aionemu.gameserver.utils.PacketSendUtility;
+import com.aionemu.gameserver.utils.MathUtil;
 import com.google.inject.Inject;
 /**
 		final Player player = getConnection().getActivePlayer();
 		if(player == null)
 			return;
 		if(targetObjectId == 0)
 		{
 			if (QuestEngine.getInstance().onDialog(new QuestEnv(null, player, questId, dialogId)))
 				break;
 			case 20:
 				//warehouse
-				sendPacket(new SM_DIALOG_WINDOW(targetObjectId, 26));
+				if(MathUtil.isInRange(npc, player, 10)) // voiding exploit with sending fake client dialog_select packet
+				{
+					sendPacket(new SM_DIALOG_WINDOW(targetObjectId, 26));
+					sendPacket(new SM_WAREHOUSE_INFO(player.getStorage(StorageType.REGULAR_WAREHOUSE.getId()).getStorageItems(), StorageType.REGULAR_WAREHOUSE.getId()));
+					sendPacket(new SM_WAREHOUSE_INFO(null, StorageType.REGULAR_WAREHOUSE.getId())); // strange retail way of sending warehouse packets
+					sendPacket(new SM_WAREHOUSE_INFO(player.getStorage(StorageType.ACCOUNT_WAREHOUSE.getId()).getUnquippedItems(), StorageType.ACCOUNT_WAREHOUSE.getId()));
+					sendPacket(new SM_WAREHOUSE_INFO(null, StorageType.ACCOUNT_WAREHOUSE.getId()));
+				}
 				break;
 			case 27:
 				//Consign trade?? npc karinerk, koorunerk
 						}
 						//TODO not enought kinah message
 					}
 					@Override
 					public void denyRequest(Creature requester, Player responder)
 					{
 				break;
 			case 38:
 				//flight and teleport
-//				if (player.getCommonData().isFlying() == true)
+				//				if (player.getCommonData().isFlying() == true)
-//				{
+				//				{
-//					PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(1300696));
+				//					PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(1300696));
-//					return;
+				//					return;
-//				}
+				//				}
 				sendPacket(new SM_TELEPORT_MAP(player, targetObjectId));
 				break;
 			case 39:

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_ENTER_WORLD.java Download diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_EQUIP_ITEM.java Download diff

	992		993
16	*/	16	*/
17	package com.aionemu.gameserver.network.aion.clientpackets;	17	package com.aionemu.gameserver.network.aion.clientpackets;
18		18
19	import com.aionemu.gameserver.model.gameobjects.player.Inventory;	19	import com.aionemu.gameserver.model.gameobjects.player.Storage;
20	import com.aionemu.gameserver.model.gameobjects.player.Player;	20	import com.aionemu.gameserver.model.gameobjects.player.Player;
21	import com.aionemu.gameserver.network.aion.AionClientPacket;	21	import com.aionemu.gameserver.network.aion.AionClientPacket;
22	import com.aionemu.gameserver.network.aion.serverpackets.SM_UPDATE_PLAYER_APPEARANCE;	22	import com.aionemu.gameserver.network.aion.serverpackets.SM_UPDATE_PLAYER_APPEARANCE;
...		...
52		52
53	final Player activePlayer = getConnection().getActivePlayer();	53	final Player activePlayer = getConnection().getActivePlayer();
54		54
55	Inventory inventory = activePlayer.getInventory();	55	Storage inventory = activePlayer.getInventory();
56		56
57	boolean operationResult = false;	57	boolean operationResult = false;
58		58
59	if(action == 0)	59	if(action == 0)
60	{	60	{
61	operationResult = inventory.equipItem(itemUniqueId, slotRead);	61	operationResult = inventory.equipItem(itemUniqueId, slotRead);

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_GROUP_DISTRIBUTION.java Download diff

	992		993
21	import com.aionemu.gameserver.model.gameobjects.player.Player;	21	import com.aionemu.gameserver.model.gameobjects.player.Player;
22	import com.aionemu.gameserver.model.group.PlayerGroup;	22	import com.aionemu.gameserver.model.group.PlayerGroup;
23	import com.aionemu.gameserver.network.aion.AionClientPacket;	23	import com.aionemu.gameserver.network.aion.AionClientPacket;
24
25	/**	24	/**
26	* @author Lyahim	25	* @author Lyahim
27	*/	26	*/
28	public class CM_GROUP_DISTRIBUTION extends AionClientPacket	27	public class CM_GROUP_DISTRIBUTION extends AionClientPacket
29	{	28	{
30	private int amount;	29	private int amount;
31		30
32	public CM_GROUP_DISTRIBUTION(int opcode)	31	public CM_GROUP_DISTRIBUTION(int opcode)
33	{	32	{
34	super(opcode);	33	super(opcode);
...		...
53	{	52	{
54	Player player = getConnection().getActivePlayer();	53	Player player = getConnection().getActivePlayer();
55	PlayerGroup pg = null;	54	PlayerGroup pg = null;
56		55
57	if(player != null)	56	if(player != null)
58	pg = player.getPlayerGroup();	57	pg = player.getPlayerGroup();
59	if(pg != null)	58	if(pg != null)
60	{	59	{
61	int rewardcount = pg.size() - 1;	60	int rewardcount = pg.size() - 1;
62		61
63	if(rewardcount <= amount)	62	if(rewardcount <= amount)
64	{	63	{
65	int reward = amount/rewardcount;	64	int reward = amount/rewardcount;
66		65
67	Iterator it = pg.getGroupMemberIterator();	66	Iterator it = pg.getGroupMemberIterator();
68	while(it.hasNext())	67	while(it.hasNext())
69	{	68	{
70	Player member = (Player)it.next();	69	Player member = (Player)it.next();
71		70
72	if(member.equals(player))	71	if(member.equals(player))
73	member.getInventory().decreaseKinah(amount);	72	member.getInventory().decreaseKinah(amount);
74	else	73	else

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_MOVE_ITEM.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_SPLIT_ITEM.java Download diff

 	private ItemService itemService;
 	int sourceItemObjId;
+	int sourceStorageType;
 	int itemAmount;
 	int destinationItemObjId;
+	int destinationStorageType;
 	int slotNum; // destination slot.
 	public CM_SPLIT_ITEM(int opcode)
 	@Override
 	protected void readImpl()
 	{
-		sourceItemObjId = readD();      // drag item unique ID. If merging and itemCount becoming null, this item must be deleted.
+		sourceItemObjId = readD();       // drag item unique ID. If merging and itemCount becoming null, this item must be deleted.
-		itemAmount = readD();           // Items count to be moved.
+		itemAmount = readD();            // Items count to be moved.
-		@SuppressWarnings("unused")
+		byte[] zeros = readB(4);         // Nothing
-		byte[] zeros = readB(5);        // Nothing
+		sourceStorageType = readC();     // Source storage
-		destinationItemObjId = readD(); // Destination item unique ID if merging. Null if spliting.
+		destinationItemObjId = readD();  // Destination item unique ID if merging. Null if spliting.
-		zeros = readB(1);               // Nothing
+		destinationStorageType = readC();// Destination storage
-		slotNum = readH();              // Destination slot. Not needed right now, Items adding only to next available slot. Not needed at all when merge.
+		slotNum = readH();               // Destination slot. Not needed right now, Items adding only to next available slot. Not needed at all when merge.
 	}
 	@Override
 	protected void runImpl()
 	{
 		Player player = getConnection().getActivePlayer();
 		if(destinationItemObjId == 0)
-			itemService.splitItem(player, sourceItemObjId, itemAmount, slotNum);
+			itemService.splitItem(player, sourceItemObjId, itemAmount, slotNum, sourceStorageType, destinationStorageType);
 		else
-			itemService.mergeItems(player, sourceItemObjId, itemAmount, destinationItemObjId);
+			itemService.mergeItems(player, sourceItemObjId, itemAmount, destinationItemObjId, sourceStorageType, destinationStorageType);
 	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_TELEPORT_SELECT.java Download diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_VIEW_PLAYER_DETAILS.java Download diff

	992		993
18		18
19	import org.apache.log4j.Logger;	19	import org.apache.log4j.Logger;
20		20
21	import com.aionemu.gameserver.model.gameobjects.player.Inventory;	21	import com.aionemu.gameserver.model.gameobjects.player.Storage;
22	import com.aionemu.gameserver.model.gameobjects.player.Player;	22	import com.aionemu.gameserver.model.gameobjects.player.Player;
23	import com.aionemu.gameserver.network.aion.AionClientPacket;	23	import com.aionemu.gameserver.network.aion.AionClientPacket;
24	import com.aionemu.gameserver.network.aion.serverpackets.SM_VIEW_PLAYER_DETAILS;	24	import com.aionemu.gameserver.network.aion.serverpackets.SM_VIEW_PLAYER_DETAILS;
...		...
32	public class CM_VIEW_PLAYER_DETAILS extends AionClientPacket	32	public class CM_VIEW_PLAYER_DETAILS extends AionClientPacket
33	{	33	{
34	private static final Logger log = Logger.getLogger(CM_VIEW_PLAYER_DETAILS.class);	34	private static final Logger log = Logger.getLogger(CM_VIEW_PLAYER_DETAILS.class);
35		35
36	private int targetObjectId;	36	private int targetObjectId;
37		37
38	@Inject	38	@Inject
...		...
65	log.warn("CHECKPOINT: can't show player details for " + targetObjectId);	65	log.warn("CHECKPOINT: can't show player details for " + targetObjectId);
66	return;	66	return;
67	}	67	}
68	Inventory inventory = player.getInventory();	68	Storage inventory = player.getInventory();
69		69
70	sendPacket(new SM_VIEW_PLAYER_DETAILS(inventory.getEquippedItems()));	70	sendPacket(new SM_VIEW_PLAYER_DETAILS(inventory.getEquippedItems()));
71	}	71	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/InventoryPacket.java Download diff

 		writeD(buf, Integer.parseInt(itemTemplate.getDescription()));
 		writeH(buf, 0);
 	}
 	/**
 	 *  All misc items
 	 * @param buf
 	{
 		writeH(buf, 0x16); //length of details
 		writeC(buf, 0);
 		if(isQuest)
 		{
 			writeC(buf, 0x20);
 			writeC(buf, 0x3E); //or can be 0x1E 0x3E 0x20 (quest)
 			writeC(buf, 0x63); // ?
 		}
 		writeD(buf, item.getItemCount());
 		writeD(buf, 0);
 		writeD(buf, 0);
 		writeC(buf, 0);
 		writeH(buf, item.getEquipmentSlot()); // not equipable items
 	}
 	/**
 	 *
 	 * @param buf
 	 * @param item
 	 */
-	protected void writeKinah(ByteBuffer buf, Item item)
+	protected void writeKinah(ByteBuffer buf, Item item, boolean isInventory)
 	{
 		writeH(buf, 0x16); //length of details
 		writeC(buf, 0);
 		writeH(buf, 0);
 		writeC(buf, 0);
 		writeH(buf, 255); // FF FF equipment
-		writeC(buf, 0);
+		if(isInventory)
+			writeC(buf, 0);
 	}
 	/**
 	 *  For all weapon. Weapon is identified by weapon_type in xml
 	 *
 	 * @param buf
 	 * @param item
 	 */
-	protected void writeWeaponInfo(ByteBuffer buf, Item item)
+	protected void writeWeaponInfo(ByteBuffer buf, Item item, boolean isInventory)
 	{
 		int itemSlotId = item.getEquipmentSlot();
 		writeH(buf, 0x4B);
 		writeC(buf, 0); //enchant (1-10)
 		writeD(buf, item.getItemTemplate().getItemId());
 		writeC(buf, 0);
 		writeItemStones(buf, item);
 		writeC(buf, 0);
 		writeD(buf, 0);
 		writeD(buf, 0);
 		writeD(buf, 0);//unk 1.5.1.9
 		writeC(buf, 0);//unk 1.5.1.9
 		writeH(buf, 0);
 		writeC(buf, 0);
 		writeH(buf, item.isEquipped() ? 255 : item.getEquipmentSlot()); // FF FF equipment
-		writeC(buf,  0);//item.isEquipped() ? 1 : 0
+		if(isInventory)
+			writeC(buf,  0);//item.isEquipped() ? 1 : 0
 	}
 	/**
 	 *  Writes manastones : 6C - statenum mask, 6H - value
 	 * @param buf
 	{
 		int count = 0;
 		List<ItemStone> itemStones = item.getItemStones();
 		if(itemStones != null)
 		{
 			for(ItemStone itemStone : itemStones)
 			{
 				if(count == 6)
 					break;
 				StatModifier modifier = itemStone.getFirstModifier();
 				if(modifier != null)
 				{
 			{
 				if(count == 6)
 					break;
 				StatModifier modifier = itemStone.getFirstModifier();
 				if(modifier != null)
 				{
 		{
 			writeB(buf, new byte[18]);
 		}
 		//for now max 6 stones - write some junk
 	}
 	/**
 	 *  For all armor. Armor is identified by armor_type in xml
 	 * @param buf
 	 * @param item
 	 */
-	protected void writeArmorInfo(ByteBuffer buf, Item item)
+	protected void writeArmorInfo(ByteBuffer buf, Item item, boolean isInventory)
 	{
 		int itemSlotId = item.getEquipmentSlot();
 		writeH(buf, 0x4F);
 		writeH(buf, 0x0B); //? some details separator
 		writeC(buf, 0); //enchant (1-10)
 		writeD(buf, item.getItemTemplate().getItemId());
 		writeC(buf, 0);
 		writeItemStones(buf, item);
 		writeC(buf, 0);
 		writeD(buf, 0);
 		writeD(buf, 0);
 		writeD(buf, 0);//unk 1.5.1.9
 		writeC(buf, 0);//unk 1.5.1.9
 		writeC(buf, 0x3E);
 		writeC(buf, 0x02);
 		writeD(buf, item.getItemCount());
 		writeH(buf, 0);
 		writeC(buf, 0);
 		writeH(buf, item.isEquipped() ? 255 : item.getEquipmentSlot()); // FF FF equipment
-		writeC(buf,  1);//item.isEquipped() ? 1 : 0
+		if(isInventory)
+			writeC(buf,  1);//item.isEquipped() ? 1 : 0
 	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_DELETE_WAREHOUSE_ITEM.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_EXCHANGE_ADD_ITEM.java Download diff

	992		993
45	{	45	{
46		46
47	writeC(buf, action); // 0 -self 1-other	47	writeC(buf, action); // 0 -self 1-other
48		48
49	writeGeneralInfo(buf, item);	49	writeGeneralInfo(buf, item);
50		50
51	ItemTemplate itemTemplate = item.getItemTemplate();	51	ItemTemplate itemTemplate = item.getItemTemplate();
52		52
53	if(itemTemplate.getItemId() == ItemId.KINAH.value())	53	if(itemTemplate.getItemId() == ItemId.KINAH.value())
54	{	54	{
55	writeKinah(buf, item);	55	writeKinah(buf, item, true);
56	}	56	}
57	else if (itemTemplate.isWeapon())	57	else if (itemTemplate.isWeapon())
58	{	58	{
59	writeWeaponInfo(buf, item);	59	writeWeaponInfo(buf, item, true);
60	}	60	}
61	else if (itemTemplate.isArmor())	61	else if (itemTemplate.isArmor())
62	{	62	{
63	writeArmorInfo(buf,item);	63	writeArmorInfo(buf,item, true);
64	}	64	}
65	else	65	else
66	{	66	{

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_INVENTORY_INFO.java Download diff

	992		993
40	public static final int EMPTY = 0;	40	public static final int EMPTY = 0;
41	public static final int FULL = 1;	41	public static final int FULL = 1;
42	public int CUBE = 0;	42	public int CUBE = 0;
43		43
44	private List<Item> items;	44	private List<Item> items;
45	private int size;	45	private int size;
46		46
47	public int packetType = FULL;	47	public int packetType = FULL;
48		48
49	/**	49	/**
50	* @param items	50	* @param items
51	*/	51	*/
...		...
57	this.size = items.size();	57	this.size = items.size();
58	this.CUBE = cubesize;	58	this.CUBE = cubesize;
59	}	59	}
60		60
61	/**	61	/**
62	* @param isEmpty	62	* @param isEmpty
63	*/	63	*/
...		...
78	writeH(buf, 0);	78	writeH(buf, 0);
79	return;	79	return;
80	}	80	}
81		81
82	// something wrong with cube part.	82	// something wrong with cube part.
83	writeC(buf, 1); // TRUE/FALSE (1/0) update cube size	83	writeC(buf, 1); // TRUE/FALSE (1/0) update cube size
84	writeC(buf, CUBE); // cube size	84	writeC(buf, CUBE); // cube size
...		...
88	for(Item item : items)	88	for(Item item : items)
89	{	89	{
90	writeGeneralInfo(buf, item);	90	writeGeneralInfo(buf, item);
91		91
92	ItemTemplate itemTemplate = item.getItemTemplate();	92	ItemTemplate itemTemplate = item.getItemTemplate();
93		93
94	if(itemTemplate.getItemId() == ItemId.KINAH.value())	94	if(itemTemplate.getItemId() == ItemId.KINAH.value())
95	{	95	{
96	writeKinah(buf, item);	96	writeKinah(buf, item, true);
97	}	97	}
98	else if (itemTemplate.isWeapon())	98	else if (itemTemplate.isWeapon())
99	{	99	{
100	writeWeaponInfo(buf, item);	100	writeWeaponInfo(buf, item, true);
101	}	101	}
102	else if (itemTemplate.isArmor())	102	else if (itemTemplate.isArmor())
103	{	103	{
104	writeArmorInfo(buf,item);	104	writeArmorInfo(buf,item, true);
105	}	105	}
106	else	106	else
107	{	107	{

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_INVENTORY_UPDATE.java Download diff

	992		993
34	{	34	{
35	private List<Item> items;	35	private List<Item> items;
36	private int size;	36	private int size;
37		37
38	public SM_INVENTORY_UPDATE(List<Item> items)	38	public SM_INVENTORY_UPDATE(List<Item> items)
39	{	39	{
40	this.items = items;	40	this.items = items;
...		...
44	/**	44	/**
45	* {@inheritDoc} dc	45	* {@inheritDoc} dc
46	*/	46	*/
47		47
48	@Override	48	@Override
49	protected void writeImpl(AionConnection con, ByteBuffer buf)	49	protected void writeImpl(AionConnection con, ByteBuffer buf)
50	{	50	{
51	writeH(buf, 25); // padding?	51	writeH(buf, 25); // padding?
52	writeH(buf, size); // number of entries	52	writeH(buf, size); // number of entries
53	for(Item item : items)	53	for(Item item : items)
54	{	54	{
55	writeGeneralInfo(buf, item);	55	writeGeneralInfo(buf, item);
56		56
57	ItemTemplate itemTemplate = item.getItemTemplate();	57	ItemTemplate itemTemplate = item.getItemTemplate();
58		58
59	if(itemTemplate.getItemId() == ItemId.KINAH.value())	59	if(itemTemplate.getItemId() == ItemId.KINAH.value())
60	{	60	{
61	writeKinah(buf, item);	61	writeKinah(buf, item, true);
62	}	62	}
63	else if (itemTemplate.isWeapon())	63	else if (itemTemplate.isWeapon())
64	{	64	{
65	writeWeaponInfo(buf, item);	65	writeWeaponInfo(buf, item, true);
66	}	66	}
67	else if (itemTemplate.isArmor())	67	else if (itemTemplate.isArmor())
68	{	68	{
69	writeArmorInfo(buf,item);	69	writeArmorInfo(buf,item, true);
70	}	70	}
71	else	71	else
72	{	72	{
73	writeGeneralItemInfo(buf, item, item.isQuest());	73	writeGeneralItemInfo(buf, item, item.isQuest());
74	writeC(buf, 0);	74	writeC(buf, 0);
75	}	75	}
76	}	76	}
77	}	77	}
78	}	78	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_SYSTEM_MESSAGE.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_UPDATE_ITEM.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_UPDATE_WAREHOUSE_ITEM.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_WAREHOUSE_INFO.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_WAREHOUSE_UPDATE.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/ServerPacketsOpcodes.java Download diff

 	static
 	{
 		Set<Integer> idSet = new HashSet<Integer>();
 		addPacketOpcode(SM_VERSION_CHECK.class, 0x00, idSet);
 		addPacketOpcode(SM_STATS_INFO.class, 0x01, idSet);
 		addPacketOpcode(SM_SET_BIND_POINT.class, 0x03, idSet);
-        addPacketOpcode(SM_ABYSS_RANK.class, 0x05, idSet);
+		addPacketOpcode(SM_ABYSS_RANK.class, 0x05, idSet);
 		addPacketOpcode(SM_MACRO_LIST.class, 0x07, idSet);
 		addPacketOpcode(SM_MACRO_RESULT.class, 0x08, idSet);
 		addPacketOpcode(SM_NICKNAME_CHECK_RESPONSE.class, 0x09, idSet);
 		addPacketOpcode(SM_DUEL.class, 0xB9, idSet);
 		addPacketOpcode(SM_TELEPORT_MAP.class, 0xBC, idSet);
 		addPacketOpcode(SM_USE_OBJECT.class, 0xBD, idSet);
+		addPacketOpcode(SM_DELETE_WAREHOUSE_ITEM.class, 0xC2, idSet);
+		addPacketOpcode(SM_UPDATE_WAREHOUSE_ITEM.class, 0xC3, idSet);
+		addPacketOpcode(SM_WAREHOUSE_INFO.class, 0xC8, idSet);
+		addPacketOpcode(SM_WAREHOUSE_UPDATE.class, 0xC9, idSet);
 		addPacketOpcode(SM_TITLE_LIST.class, 0xD0, idSet);
 		addPacketOpcode(SM_TITLE_SET.class, 0xD1, idSet);
 		addPacketOpcode(SM_CHANNEL_INFO.class, 0xDD, idSet);
 		addPacketOpcode(SM_STATUPDATE_MP.class, 0xFC, idSet);
 		addPacketOpcode(SM_ATTACK_STATUS.class, 0xFD, idSet);
 		addPacketOpcode(SM_RECONNECT_KEY.class, 0xFF, idSet);
 		addPacketOpcode(SM_CUSTOM_PACKET.class, 99999, idSet); // fake packet
 		addPacketOpcode(SM_BLOCK_RESPONSE.class, 0xDF, idSet);
 		addPacketOpcode(SM_RIFT_STATUS.class, 0xA4, idSet);
 		//Unrecognized Opcodes from 1.5.4:
 		//addPacketOpcode(SM_BUY_LIST.class, 0x7E, idSet);
 		//addPacketOpcode(SM_GUILD_DETAILS.class, 0x24, idSet);
 		if(idSet.contains(opcode))
 			throw new IllegalArgumentException(String.format("There already exists another packet with id 0x%02X", opcode));
 		idSet.add(opcode);
 		opcodes.put(packetClass, opcode);
 	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/factories/AionPacketHandlerFactory.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/questEngine/Quest.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/AccountService.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/ExchangeService.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/ItemService.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/PlayerService.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/TeleportService.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/TradeService.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/action/ItemUseAction.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/utils/stats/StatFunctions.java Download diff

File was changed - ok, show the diff

trunk/AE-go_GameServer/test/com/aionemu/gameserver/model/ItemStorageTest.java Download diff

File was changed - ok, show the diff

	992		993
20		20
21	import com.aionemu.gameserver.configs.AdminConfig;	21	import com.aionemu.gameserver.configs.AdminConfig;
22	import com.aionemu.gameserver.model.gameobjects.Item;	22	import com.aionemu.gameserver.model.gameobjects.Item;
23	import com.aionemu.gameserver.model.gameobjects.player.Inventory;	23	import com.aionemu.gameserver.model.gameobjects.player.Storage;
24	import com.aionemu.gameserver.model.gameobjects.player.Player;	24	import com.aionemu.gameserver.model.gameobjects.player.Player;
25	import com.aionemu.gameserver.model.items.ItemId;	25	import com.aionemu.gameserver.model.items.ItemId;
26	import com.aionemu.gameserver.network.aion.serverpackets.SM_INVENTORY_UPDATE;	26	import com.aionemu.gameserver.network.aion.serverpackets.SM_INVENTORY_UPDATE;
...		...
52	PacketSendUtility.sendMessage(admin, "You dont have enough rights to execute this command");	52	PacketSendUtility.sendMessage(admin, "You dont have enough rights to execute this command");
53	return;	53	return;
54	}	54	}
55		55
56	if(params.length == 0 \|\| params.length > 2)	56	if(params.length == 0 \|\| params.length > 2)
57	{	57	{
58	PacketSendUtility.sendMessage(admin, "syntax //add <item ID> <quantity>");	58	PacketSendUtility.sendMessage(admin, "syntax //add <item ID> <quantity>");
...		...
61		61
62	int itemId = 0;	62	int itemId = 0;
63	int itemCount = 1;	63	int itemCount = 1;
64		64
65	try	65	try
66	{	66	{
67	itemId = Integer.parseInt(params[0]);	67	itemId = Integer.parseInt(params[0]);
...		...
75	PacketSendUtility.sendMessage(admin, "Parameters need to be an integer.");	75	PacketSendUtility.sendMessage(admin, "Parameters need to be an integer.");
76	return;	76	return;
77	}	77	}
78		78
79	Item item = itemService.newItem(itemId, itemCount);	79	Item item = itemService.newItem(itemId, itemCount);
80		80
81	if(item == null)	81	if(item == null)
82	{	82	{
83	PacketSendUtility.sendMessage(admin, "Item template was not found for this itemId");	83	PacketSendUtility.sendMessage(admin, "Item template was not found for this itemId");
84	return;	84	return;
85	}	85	}
86		86
87	Inventory inventory = admin.getInventory();	87	Storage inventory = admin.getInventory();
88	Item addedItem = null;	88	Item addedItem = null;
89		89
90	if(itemId == ItemId.KINAH.value())	90	if(itemId == ItemId.KINAH.value())
91	{	91	{
92	addedItem = inventory.getKinahItem();	92	addedItem = inventory.getKinahItem();
...		...
97	{	97	{
98	addedItem = inventory.addToBag(item);	98	addedItem = inventory.addToBag(item);
99	}	99	}
100		100
101	if(addedItem != null)	101	if(addedItem != null)
102	{	102	{
103	PacketSendUtility.sendPacket(admin, new SM_INVENTORY_UPDATE(Collections.singletonList(addedItem)));	103	PacketSendUtility.sendPacket(admin, new SM_INVENTORY_UPDATE(Collections.singletonList(addedItem)));

	992		993
57	{	57	{
58	if(!validateConditions(player))	58	if(!validateConditions(player))
59	return;	59	return;
60		60
61	//item animation and message	61	//item animation and message
62	ItemTemplate itemTemplate = parentItem.getItemTemplate();	62	ItemTemplate itemTemplate = parentItem.getItemTemplate();
63	//PacketSendUtility.sendPacket(player, SM_SYSTEM_MESSAGE.USE_ITEM(itemTemplate.getDescription()));	63	//PacketSendUtility.sendPacket(player, SM_SYSTEM_MESSAGE.USE_ITEM(itemTemplate.getDescription()));
...		...
67	player.getSkillList().addSkill(skillid, 1);	67	player.getSkillList().addSkill(skillid, 1);
68	PacketSendUtility.sendPacket(player, new SM_SKILL_LIST(new SkillListEntry(skillid, 1, null)));	68	PacketSendUtility.sendPacket(player, new SM_SKILL_LIST(new SkillListEntry(skillid, 1, null)));
69	DAOManager.getDAO(PlayerSkillListDAO.class).storeSkills(player);	69	DAOManager.getDAO(PlayerSkillListDAO.class).storeSkills(player);
70		70
71	//remove book from inventory (assuming its not stackable)	71	//remove book from inventory (assuming its not stackable)
72	Item item = player.getInventory().getItemByObjId(parentItem.getObjectId());	72	Item item = player.getInventory().getItemByObjId(parentItem.getObjectId());
73	player.getInventory().removeFromBag(item);	73	player.getInventory().removeFromBag(item, true);
74	PacketSendUtility.sendPacket(player, new SM_DELETE_ITEM(parentItem.getObjectId()));	74	PacketSendUtility.sendPacket(player, new SM_DELETE_ITEM(parentItem.getObjectId()));
75	}	75	}
76		76
...		...
79	//1. check player level	79	//1. check player level
80	if(player.getCommonData().getLevel() < level)	80	if(player.getCommonData().getLevel() < level)
81	return false;	81	return false;
82		82
83	PlayerClass pc = player.getCommonData().getPlayerClass();	83	PlayerClass pc = player.getCommonData().getPlayerClass();
84		84
85	if(!validateClass(pc))	85	if(!validateClass(pc))
86	return false;	86	return false;
87		87
88	//4. check player race and SkillRace.ALL	88	//4. check player race and SkillRace.ALL
89	if(player.getCommonData().getRace().ordinal() != race.ordinal()	89	if(player.getCommonData().getRace().ordinal() != race.ordinal()
90	&& race != SkillRace.ALL)	90	&& race != SkillRace.ALL)
...		...
92	//5. check whether this skill is already learned	92	//5. check whether this skill is already learned
93	if(player.getSkillList().isSkillPresent(skillid))	93	if(player.getSkillList().isSkillPresent(skillid))
94	return false;	94	return false;
95		95
96	return true;	96	return true;
97	}	97	}
98		98
...		...
106	if(pc.ordinal() == playerClass.ordinal()	106	if(pc.ordinal() == playerClass.ordinal()
107	\|\| playerClass == SkillClass.ALL)	107	\|\| playerClass == SkillClass.ALL)
108	result = true;	108	result = true;
109		109
110	return result;	110	return result;
111	}	111	}
112	}	112	}

	992		993
18		18
19	import java.sql.Timestamp;	19	import java.sql.Timestamp;
20		20
21	import com.aionemu.gameserver.model.gameobjects.player.Inventory;	21	import com.aionemu.gameserver.model.gameobjects.player.Storage;
22	import com.aionemu.gameserver.model.gameobjects.player.PlayerAppearance;	22	import com.aionemu.gameserver.model.gameobjects.player.PlayerAppearance;
23	import com.aionemu.gameserver.model.gameobjects.player.PlayerCommonData;	23	import com.aionemu.gameserver.model.gameobjects.player.PlayerCommonData;
24		24
...		...
35	{	35	{
36	private PlayerCommonData playerCommonData;	36	private PlayerCommonData playerCommonData;
37	private PlayerAppearance appereance;	37	private PlayerAppearance appereance;
38	private Inventory inventory;	38	private Storage inventory;
39	private Timestamp creationDate;	39	private Timestamp creationDate;
40	private Timestamp deletionDate;	40	private Timestamp deletionDate;
41		41
42	public PlayerAccountData(PlayerCommonData playerCommonData, PlayerAppearance appereance, Inventory inventory)	42	public PlayerAccountData(PlayerCommonData playerCommonData, PlayerAppearance appereance, Storage inventory)
43	{	43	{
44	this.playerCommonData = playerCommonData;	44	this.playerCommonData = playerCommonData;
45	this.appereance = appereance;	45	this.appereance = appereance;
...		...
94	/**	94	/**
95	* @return the inventory	95	* @return the inventory
96	*/	96	*/
97	public Inventory getInventory()	97	public Storage getInventory()
98	{	98	{
99	return inventory;	99	return inventory;
100	}	100	}

	992		993
25	import com.aionemu.gameserver.model.account.AccountTime;	25	import com.aionemu.gameserver.model.account.AccountTime;
26	import com.aionemu.gameserver.model.account.PlayerAccountData;	26	import com.aionemu.gameserver.model.account.PlayerAccountData;
27	import com.aionemu.gameserver.model.gameobjects.Item;	27	import com.aionemu.gameserver.model.gameobjects.Item;
28	import com.aionemu.gameserver.model.gameobjects.player.Inventory;	28	import com.aionemu.gameserver.model.gameobjects.player.Storage;
29	import com.aionemu.gameserver.model.gameobjects.player.Player;	29	import com.aionemu.gameserver.model.gameobjects.player.Player;
30	import com.aionemu.gameserver.model.templates.BindPointTemplate;	30	import com.aionemu.gameserver.model.templates.BindPointTemplate;
31	import com.aionemu.gameserver.network.aion.AionClientPacket;	31	import com.aionemu.gameserver.network.aion.AionClientPacket;
...		...
156	// will be removed next time	156	// will be removed next time
157		157
158	//items	158	//items
159	Inventory inventory = player.getInventory();	159	Storage inventory = player.getInventory();
160	List<Item> equipedItems = inventory.getEquippedItems();	160	List<Item> equipedItems = inventory.getEquippedItems();
161	if(equipedItems.size() != 0)	161	if(equipedItems.size() != 0)
162	{	162	{
...		...
221	AccountTime accountTime = getConnection().getAccount().getAccountTime();	221	AccountTime accountTime = getConnection().getAccount().getAccountTime();
222		222
223	sendPacket(SM_SYSTEM_MESSAGE.ACCUMULATED_TIME(	223	sendPacket(SM_SYSTEM_MESSAGE.ACCUMULATED_TIME(
224	accountTime.getAccumulatedOnlineHours(),	224	accountTime.getAccumulatedOnlineHours(),
225	accountTime.getAccumulatedOnlineMinutes(),	225	accountTime.getAccumulatedOnlineMinutes(),
226	accountTime.getAccumulatedRestHours(),	226	accountTime.getAccumulatedRestHours(),
227	accountTime.getAccumulatedRestMinutes())	227	accountTime.getAccumulatedRestMinutes())
228	);	228	);
229		229
230	/*	230	/*
231	* Needed	231	* Needed
232	*/	232	*/
233	sendPacket(new SM_PLAYER_SPAWN(player));	233	sendPacket(new SM_PLAYER_SPAWN(player));
234	sendPacket(new SM_EMOTION_LIST());	234	sendPacket(new SM_EMOTION_LIST());
235	sendPacket(new SM_INFLUENCE_RATIO());	235	sendPacket(new SM_INFLUENCE_RATIO());
236	sendPacket(new SM_PRICES());	236	sendPacket(new SM_PRICES());
237	sendPacket(new SM_PLAYER_ID(player));	237	sendPacket(new SM_PLAYER_ID(player));
238	sendPacket(new SM_ABYSS_RANK());	238	sendPacket(new SM_ABYSS_RANK());
239	sendPacket(new SM_FLY_TIME());	239	sendPacket(new SM_FLY_TIME());
240		240
241	sendPacket(new SM_MESSAGE(0, null, "Welcome to " + Config.SERVER_NAME	241	sendPacket(new SM_MESSAGE(0, null, "Welcome to " + Config.SERVER_NAME
242	+ " server\nPowered by aion-unique software\ndeveloped by www.aion-unique.org team.\nCopyright 2010", null,	242	+ " server\nPowered by aion-unique software\ndeveloped by www.aion-unique.org team.\nCopyright 2010", null,
243	ChatType.ANNOUNCEMENTS));	243	ChatType.ANNOUNCEMENTS));
244		244
245	playerService.playerLoggedIn(player);	245	playerService.playerLoggedIn(player);
246		246
247	ClassChangeService.showClassChangeDialog(player);	247	ClassChangeService.showClassChangeDialog(player);
248	}	248	}
249	else	249	else
250	{	250	{
...		...
252	}	252	}
253	}	253	}
254		254
255		255
256	}	256	}

	992		993
18		18
19	import com.aionemu.gameserver.dataholders.DataManager;	19	import com.aionemu.gameserver.dataholders.DataManager;
20	import com.aionemu.gameserver.model.gameobjects.Npc;	20	import com.aionemu.gameserver.model.gameobjects.Npc;
21	import com.aionemu.gameserver.model.gameobjects.player.Inventory;	21	import com.aionemu.gameserver.model.gameobjects.player.Storage;
22	import com.aionemu.gameserver.model.gameobjects.player.Player;	22	import com.aionemu.gameserver.model.gameobjects.player.Player;
23	import com.aionemu.gameserver.model.templates.teleport.TelelocationTemplate;	23	import com.aionemu.gameserver.model.templates.teleport.TelelocationTemplate;
24	import com.aionemu.gameserver.model.templates.teleport.TeleporterTemplate;	24	import com.aionemu.gameserver.model.templates.teleport.TeleporterTemplate;
...		...
39	public int locId;	39	public int locId;
40		40
41	public TelelocationTemplate _tele;	41	public TelelocationTemplate _tele;
42		42
43	private TeleporterTemplate teleport;	43	private TeleporterTemplate teleport;
44		44
45	public CM_TELEPORT_SELECT(int opcode)	45	public CM_TELEPORT_SELECT(int opcode)
...		...
66	{	66	{
67	Player activePlayer = getConnection().getActivePlayer();	67	Player activePlayer = getConnection().getActivePlayer();
68	@SuppressWarnings("unused")	68	@SuppressWarnings("unused")
69	Inventory bag = activePlayer.getInventory();	69	Storage bag = activePlayer.getInventory();
70	World world = activePlayer.getActiveRegion().getWorld();	70	World world = activePlayer.getActiveRegion().getWorld();
71	Npc npc = (Npc)world.findAionObject(targetObjectId);	71	Npc npc = (Npc)world.findAionObject(targetObjectId);
72		72
73	if(activePlayer == null)	73	if(activePlayer == null)
74	return;	74	return;
75		75
76	teleport = DataManager.TELEPORTER_DATA.getTeleporterTemplate(npc.getNpcId());	76	teleport = DataManager.TELEPORTER_DATA.getTeleporterTemplate(npc.getNpcId());
77		77
78	switch(teleport.getType())	78	switch(teleport.getType())
79	{	79	{
80	case FLIGHT:	80	case FLIGHT: