trade and private store code format

L2_GameServer/java/com/l2jserver/gameserver/model/L2TradeList.java

@@ -39,51 +39,51 @@ import javolution.util.FastMap;
  */
 public class L2TradeList
 {
-    private Map<Integer, L2TradeItem> _items;
+	private Map<Integer, L2TradeItem> _items;
 	private int _listId;
 	private String _buystorename, _sellstorename;
 	private boolean _hasLimitedStockItem;
-    private String _npcId;
-
+	private String _npcId;
+	
 	public L2TradeList(int listId)
 	{
 		_items = new FastMap<Integer, L2TradeItem>();
 		_listId = listId;
 	}
-
-    public void setNpcId(String id)
-    {
-        _npcId = id;
-    }
-
-    public String getNpcId()
-    {
-        return _npcId;
-    }
-
+	
+	public void setNpcId(String id)
+	{
+		_npcId = id;
+	}
+	
+	public String getNpcId()
+	{
+		return _npcId;
+	}
+	
 	public void addItem(L2TradeItem item)
 	{
 		_items.put(item.getItemId(), item);
-        if (item.hasLimitedStock())
-        {
-            this.setHasLimitedStockItem(true);
-        }
+		if (item.hasLimitedStock())
+		{
+			this.setHasLimitedStockItem(true);
+		}
 	}
-
-    public void replaceItem(int itemID, long price)
-    {
-        L2TradeItem item = _items.get(itemID);
-        if (item != null)
-        {
-            item.setPrice(price);
-        }
-    }
-    
-    public void removeItem(int itemID)
-    {
-        _items.remove(itemID);
-    }
-
+	
+	public void replaceItem(int itemID, long price)
+	{
+		L2TradeItem item = _items.get(itemID);
+		if (item != null)
+		{
+			item.setPrice(price);
+		}
+	}
+	
+	public void removeItem(int itemID)
+	{
+		_items.remove(itemID);
+	}
+	
 	/**
 	 * @return Returns the listId.
 	 */
@@ -91,43 +91,43 @@ public class L2TradeList
 	{
 		return _listId;
 	}
-    
+	
 	/**
-     * @param hasLimitedStockItem The hasLimitedStockItem to set.
-     */
-    public void setHasLimitedStockItem(boolean hasLimitedStockItem)
-    {
-        _hasLimitedStockItem = hasLimitedStockItem;
-    }
-
-    /**
-     * @return Returns the hasLimitedStockItem.
-     */
-    public boolean hasLimitedStockItem()
-    {
-        return _hasLimitedStockItem;
-    }
-
-    public void setSellStoreName(String name)
+	 * @param hasLimitedStockItem The hasLimitedStockItem to set.
+	 */
+	public void setHasLimitedStockItem(boolean hasLimitedStockItem)
+	{
+		_hasLimitedStockItem = hasLimitedStockItem;
+	}
+	
+	/**
+	 * @return Returns the hasLimitedStockItem.
+	 */
+	public boolean hasLimitedStockItem()
+	{
+		return _hasLimitedStockItem;
+	}
+	
+	public void setSellStoreName(String name)
 	{
 		_sellstorename = name;
 	}
-    
+	
 	public String getSellStoreName()
 	{
 		return _sellstorename;
 	}
-    
+	
 	public void setBuyStoreName(String name)
 	{
 		_buystorename = name;
 	}
-    
+	
 	public String getBuyStoreName()
 	{
 		return _buystorename;
 	}
-
+	
 	/**
 	 * @return Returns the items.
 	 */
@@ -135,250 +135,248 @@ public class L2TradeList
 	{
 		return _items.values();
 	}
-
-    public List<L2TradeItem> getItems(int start, int end)
-    {
-        List<L2TradeItem> list = new LinkedList<L2TradeItem>();
-        list.addAll(_items.values());
-        return list.subList(start, end);
-    }
-
+	
+	public List<L2TradeItem> getItems(int start, int end)
+	{
+		List<L2TradeItem> list = new LinkedList<L2TradeItem>();
+		list.addAll(_items.values());
+		return list.subList(start, end);
+	}
+	
 	public long getPriceForItemId(int itemId)
 	{
-        L2TradeItem item = _items.get(itemId);
-        if (item != null)
-        {
+		L2TradeItem item = _items.get(itemId);
+		if (item != null)
+		{
 			return item.getPrice();
 		}
 		return -1;
 	}
-    
-    public L2TradeItem getItemById(int itemId)
-    {
-        return _items.get(itemId);
-    }
-    
-    /*
+	
+	public L2TradeItem getItemById(int itemId)
+	{
+		return _items.get(itemId);
+	}
+	
+	/*
 	public boolean countDecrease(int itemId)
 	{
-        L2TradeItem item = _items.get(itemId);
-        if (item != null)
-        {
-            return item.hasLimitedStock();
-        }
+	    L2TradeItem item = _items.get(itemId);
+	    if (item != null)
+	    {
+	        return item.hasLimitedStock();
+	    }
 		return false;
 	}*/
-    
+
 	public boolean containsItemId(int itemId)
 	{
 		return _items.containsKey(itemId);
 	}
-    
-    /**
-     * Itens representation for trade lists
-     *
-     * @author  KenM
-     */
-    public static class L2TradeItem
-    {
-        private static final Logger _log = Logger.getLogger(L2TradeItem.class.getName());
-
-        private final int _listId;
-        private final int _itemId;
-        private final L2Item _template;
-        private long _price;
-        
-        // count related
-        private AtomicLong _currentCount = new AtomicLong();
-        private long _maxCount = -1;
-        private long _restoreDelay;
-        private long _nextRestoreTime;
-        
-        public L2TradeItem(int listId, int itemId)
-        {
-        	_listId = listId;
-            _itemId = itemId;
-            _template = ItemTable.getInstance().getTemplate(itemId);
-        }
-
-        /**
-         * @return Returns the itemId.
-         */
-        public int getItemId()
-        {
-            return _itemId;
-        }
-
-        /**
-         * @param price The price to set.
-         */
-        public void setPrice(long price)
-        {
-            _price = price;
-        }
-
-        /**
-         * @return Returns the price.
-         */
-        public long getPrice()
-        {
-            return _price;
-        }
-        
-        public L2Item getTemplate()
-        {
-            return _template;
-        }
-
-        /**
-         * @param currentCount The currentCount to set.
-         */
-        public void setCurrentCount(long currentCount)
-        {
-            _currentCount.set(currentCount);
-        }
-        
-        public boolean decreaseCount(long val)
-        {
-            return _currentCount.addAndGet(-val) >= 0;
-        }
-
-        /**
-         * @return Returns the currentCount.
-         */
-        public long getCurrentCount()
-        {
-            if (this.hasLimitedStock() && this.isPendingStockUpdate())
-            {
-                this.restoreInitialCount();
-            }
-            long ret = _currentCount.get();
-            return ret > 0 ? ret : 0;
-        }
-        
-        public boolean isPendingStockUpdate()
-        {
-            return System.currentTimeMillis() >= _nextRestoreTime;
-        }
-        
-        public void restoreInitialCount()
-        {
-            this.setCurrentCount(this.getMaxCount());
-            _nextRestoreTime = _nextRestoreTime + this.getRestoreDelay();
-            
-            // consume until next update is on future
-            if (this.isPendingStockUpdate() && this.getRestoreDelay() > 0)
-            {
-                _nextRestoreTime = System.currentTimeMillis() + this.getRestoreDelay();
-            }
-            
-            // exec asynchronously
-            try
-            {
-                ThreadPoolManager.getInstance().executeTask(new TimerSave());
-            }
-            catch (RejectedExecutionException e)
-            {
-            	// during shutdown executeTask() failed
-            	saveDataTimer();
-            }
-        }
-
-        /**
-         * @param maxCount The maxCount to set.
-         */
-        public void setMaxCount(long maxCount)
-        {
-            _maxCount = maxCount;
-        }
-
-        /**
-         * @return Returns the maxCount.
-         */
-        public long getMaxCount()
-        {
-            return _maxCount;
-        }
-        
-        public boolean hasLimitedStock()
-        {
-            return this.getMaxCount() > -1;
-        }
-
-        /**
-         * @param restoreDelay The restoreDelay to set (in hours)
-         */
-        public void setRestoreDelay(long restoreDelay)
-        {
-            _restoreDelay = restoreDelay*60*60*1000;
-        }
-
-        /**
-         * @return Returns the restoreDelay (in milis)
-         */
-        public long getRestoreDelay()
-        {
-            return _restoreDelay;
-        }
-
-        /**
-         * For resuming when server loads
-         * @param nextRestoreTime The nextRestoreTime to set.
-         */
-        public void setNextRestoreTime(long nextRestoreTime)
-        {
-            _nextRestoreTime = nextRestoreTime;
-        }
-
-        /**
-         * @return Returns the nextRestoreTime.
-         */
-        public long getNextRestoreTime()
-        {
-            return _nextRestoreTime;
-        }
-        
-        class TimerSave implements Runnable
-        {
-            /**
-             * @see java.lang.Runnable#run()
-             */
-            public void run()
-            {
-                L2TradeItem.this.saveDataTimer();
-            }
-        }
-        
-        protected void saveDataTimer()
-        {
-            Connection con = null;
-            try
-            {
-                con = L2DatabaseFactory.getInstance().getConnection();
-                PreparedStatement statement = con.prepareStatement("UPDATE merchant_buylists SET savetimer =? WHERE shop_id =? and item_id =?");
-                statement.setLong(1, _nextRestoreTime);
-                statement.setInt(2, _listId);
-                statement.setInt(3, _itemId);
-                statement.executeUpdate();
-                statement.close();
-            } 
-            catch (Exception e)
-            {
-                _log.log(Level.SEVERE, "L2TradeItem: Could not update Timer save in Buylist" );
-            }
-            finally
-            {
-                try
-                {
-                    con.close();
-                }
-                catch (Exception e)
-                {
-                    // nothing
-                }
-            }
-        }
-    }
+	
+	/**
+	 * Itens representation for trade lists
+	 *
+	 * @author  KenM
+	 */
+	public static class L2TradeItem
+	{
+		private static final Logger _log = Logger.getLogger(L2TradeItem.class.getName());
+		
+		private final int _listId;
+		private final int _itemId;
+		private final L2Item _template;
+		private long _price;
+		
+		// count related
+		private AtomicLong _currentCount = new AtomicLong();
+		private long _maxCount = -1;
+		private long _restoreDelay;
+		private long _nextRestoreTime;
+		
+		public L2TradeItem(int listId, int itemId)
+		{
+			_listId = listId;
+			_itemId = itemId;
+			_template = ItemTable.getInstance().getTemplate(itemId);
+		}
+		
+		/**
+		 * @return Returns the itemId.
+		 */
+		public int getItemId()
+		{
+			return _itemId;
+		}
+		
+		/**
+		 * @param price The price to set.
+		 */
+		public void setPrice(long price)
+		{
+			_price = price;
+		}
+		
+		/**
+		 * @return Returns the price.
+		 */
+		public long getPrice()
+		{
+			return _price;
+		}
+		
+		public L2Item getTemplate()
+		{
+			return _template;
+		}
+		
+		/**
+		 * @param currentCount The currentCount to set.
+		 */
+		public void setCurrentCount(long currentCount)
+		{
+			_currentCount.set(currentCount);
+		}
+		
+		public boolean decreaseCount(long val)
+		{
+			return _currentCount.addAndGet(-val) >= 0;
+		}
+		
+		/**
+		 * @return Returns the currentCount.
+		 */
+		public long getCurrentCount()
+		{
+			if (this.hasLimitedStock() && this.isPendingStockUpdate())
+			{
+				this.restoreInitialCount();
+			}
+			long ret = _currentCount.get();
+			return ret > 0 ? ret : 0;
+		}
+		
+		public boolean isPendingStockUpdate()
+		{
+			return System.currentTimeMillis() >= _nextRestoreTime;
+		}
+		
+		public void restoreInitialCount()
+		{
+			this.setCurrentCount(this.getMaxCount());
+			_nextRestoreTime = _nextRestoreTime + this.getRestoreDelay();
+			
+			// consume until next update is on future
+			if (this.isPendingStockUpdate() && this.getRestoreDelay() > 0)
+			{
+				_nextRestoreTime = System.currentTimeMillis() + this.getRestoreDelay();
+			}
+			
+			// exec asynchronously
+			try
+			{
+				ThreadPoolManager.getInstance().executeTask(new TimerSave());
+			}
+			catch (RejectedExecutionException e)
+			{
+				// during shutdown executeTask() failed
+				saveDataTimer();
+			}
+		}
+		
+		/**
+		 * @param maxCount The maxCount to set.
+		 */
+		public void setMaxCount(long maxCount)
+		{
+			_maxCount = maxCount;
+		}
+		
+		/**
+		 * @return Returns the maxCount.
+		 */
+		public long getMaxCount()
+		{
+			return _maxCount;
+		}
+		
+		public boolean hasLimitedStock()
+		{
+			return this.getMaxCount() > -1;
+		}
+		
+		/**
+		 * @param restoreDelay The restoreDelay to set (in hours)
+		 */
+		public void setRestoreDelay(long restoreDelay)
+		{
+			_restoreDelay = restoreDelay * 60 * 60 * 1000;
+		}
+		
+		/**
+		 * @return Returns the restoreDelay (in milis)
+		 */
+		public long getRestoreDelay()
+		{
+			return _restoreDelay;
+		}
+		
+		/**
+		 * For resuming when server loads
+		 * @param nextRestoreTime The nextRestoreTime to set.
+		 */
+		public void setNextRestoreTime(long nextRestoreTime)
+		{
+			_nextRestoreTime = nextRestoreTime;
+		}
+		
+		/**
+		 * @return Returns the nextRestoreTime.
+		 */
+		public long getNextRestoreTime()
+		{
+			return _nextRestoreTime;
+		}
+		
+		class TimerSave implements Runnable
+		{
+			/**
+			 * @see java.lang.Runnable#run()
+			 */
+			public void run()
+			{
+				L2TradeItem.this.saveDataTimer();
+			}
+		}
+		
+		protected void saveDataTimer()
+		{
+			Connection con = null;
+			try
+			{
+				con = L2DatabaseFactory.getInstance().getConnection();
+				PreparedStatement statement = con.prepareStatement("UPDATE merchant_buylists SET savetimer =? WHERE shop_id =? and item_id =?");
+				statement.setLong(1, _nextRestoreTime);
+				statement.setInt(2, _listId);
+				statement.setInt(3, _itemId);
+				statement.executeUpdate();
+				statement.close();
+			}
+			catch (Exception e)
+			{
+				_log.log(Level.SEVERE, "L2TradeItem: Could not update Timer save in Buylist");
+			}
+			finally
+			{
+				try
+				{
+					con.close();
+				}
+				catch (Exception e)
+				{
+					// nothing
+				}
+			}
+		}
+	}
 }
-
-

L2_GameServer/java/com/l2jserver/gameserver/model/TradeItem.java

@@ -21,73 +21,75 @@ package com.l2jserver.gameserver.model;
  */
 public final class TradeItem
 {
-    private int _objectId;
-    private int _itemId;
-    private long _price;
-    private long _storePrice;
-    private long _count;
+	private int _objectId;
+	private int _itemId;
+	private long _price;
+	private long _storePrice;
+	private long _count;
 	private int _enchantLevel;
-
-	public TradeItem() {}
-
-    public void setObjectId(int id)
-    {
-        _objectId = id;
-    }
-
-    public int getObjectId()
-    {
-        return _objectId;
-    }
-
-    public void setItemId(int id)
-    {
-        _itemId = id;
-    }
-
-    public int getItemId()
-    {
-        return _itemId;
-    }
-
-    public void setOwnersPrice(long price)
-    {
-        _price = price;
-    }
-
-    public long getOwnersPrice()
-    {
-        return _price;
-    }
-
-    public void setstorePrice(long price)
-    {
-        _storePrice = price;
-    }
-
-    public long getStorePrice()
-    {
-        return _storePrice;
-    }
-
-    public void setCount(long count)
-    {
-        _count = count;
-    }
-
-    public long getCount()
-    {
-        return _count;
-    }
-
-    public void setEnchantLevel(int enchant)
-    {
+	
+	public TradeItem()
+	{
+	}
+	
+	public void setObjectId(int id)
+	{
+		_objectId = id;
+	}
+	
+	public int getObjectId()
+	{
+		return _objectId;
+	}
+	
+	public void setItemId(int id)
+	{
+		_itemId = id;
+	}
+	
+	public int getItemId()
+	{
+		return _itemId;
+	}
+	
+	public void setOwnersPrice(long price)
+	{
+		_price = price;
+	}
+	
+	public long getOwnersPrice()
+	{
+		return _price;
+	}
+	
+	public void setstorePrice(long price)
+	{
+		_storePrice = price;
+	}
+	
+	public long getStorePrice()
+	{
+		return _storePrice;
+	}
+	
+	public void setCount(long count)
+	{
+		_count = count;
+	}
+	
+	public long getCount()
+	{
+		return _count;
+	}
+	
+	public void setEnchantLevel(int enchant)
+	{
 		_enchantLevel = enchant;
-    }
-
-    public int getEnchantLevel()
-    {
-        return _enchantLevel;
-    }
-
+	}
+	
+	public int getEnchantLevel()
+	{
+		return _enchantLevel;
+	}
+	
 }

L2_GameServer/java/com/l2jserver/gameserver/model/TradeList.java

@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.item.L2EtcItemType;
 import com.l2jserver.gameserver.templates.item.L2Item;
+import com.l2jserver.gameserver.util.Util;
 
 import javolution.util.FastList;
 
@@ -50,8 +51,8 @@ public class TradeList
 		private long _price;
 		private final byte _elemAtkType;
 		private final int _elemAtkPower;
-		private int[] _elemDefAttr = {0, 0, 0, 0, 0, 0};
-
+		private int[] _elemDefAttr = { 0, 0, 0, 0, 0, 0 };
+		
 		public TradeItem(L2ItemInstance item, long count, long price)
 		{
 			_objectId = item.getObjectId();
@@ -65,7 +66,7 @@ public class TradeList
 			for (byte i = 0; i < 6; i++)
 				_elemDefAttr[i] = item.getElementDefAttr(i);
 		}
-
+		
 		public TradeItem(L2Item item, long count, long price)
 		{
 			_objectId = 0;
@@ -78,7 +79,7 @@ public class TradeList
 			_elemAtkType = Elementals.NONE;
 			_elemAtkPower = 0;
 		}
-
+		
 		public TradeItem(TradeItem item, long count, long price)
 		{
 			_objectId = item.getObjectId();
@@ -93,140 +94,140 @@ public class TradeList
 			for (byte i = 0; i < 6; i++)
 				_elemDefAttr[i] = item.getElementDefAttr(i);
 		}
-
+		
 		public void setObjectId(int objectId)
 		{
 			_objectId = objectId;
 		}
-
+		
 		public int getObjectId()
 		{
 			return _objectId;
 		}
-
+		
 		public L2Item getItem()
 		{
 			return _item;
 		}
-
+		
 		public void setEnchant(int enchant)
 		{
 			_enchant = enchant;
 		}
-
+		
 		public int getEnchant()
 		{
 			return _enchant;
 		}
-
+		
 		public int getCustomType2()
 		{
 			return _type2;
 		}
-
+		
 		public void setCount(long count)
 		{
 			_count = count;
 		}
-
+		
 		public long getCount()
 		{
 			return _count;
 		}
-
+		
 		public long getStoreCount()
 		{
 			return _storeCount;
 		}
-
+		
 		public void setPrice(long price)
 		{
 			_price = price;
 		}
-
+		
 		public long getPrice()
 		{
 			return _price;
 		}
-
+		
 		public byte getAttackElementType()
 		{
 			return _elemAtkType;
 		}
-
+		
 		public int getAttackElementPower()
 		{
 			return _elemAtkPower;
 		}
-
+		
 		public int getElementDefAttr(byte i)
 		{
 			return _elemDefAttr[i];
 		}
 	}
-
+	
 	private static final Logger _log = Logger.getLogger(TradeList.class.getName());
-
+	
 	private final L2PcInstance _owner;
 	private L2PcInstance _partner;
 	private final List<TradeItem> _items;
 	private String _title;
 	private boolean _packaged;
-
+	
 	private boolean _confirmed = false;
 	private boolean _locked = false;
-
+	
 	public TradeList(L2PcInstance owner)
 	{
 		_items = new FastList<TradeItem>();
 		_owner = owner;
 	}
-
+	
 	public L2PcInstance getOwner()
 	{
 		return _owner;
 	}
-
+	
 	public void setPartner(L2PcInstance partner)
 	{
 		_partner = partner;
 	}
-
+	
 	public L2PcInstance getPartner()
 	{
 		return _partner;
 	}
-
+	
 	public void setTitle(String title)
 	{
 		_title = title;
 	}
-
+	
 	public String getTitle()
 	{
 		return _title;
 	}
-
+	
 	public boolean isLocked()
 	{
 		return _locked;
 	}
-
+	
 	public boolean isConfirmed()
 	{
 		return _confirmed;
 	}
-
+	
 	public boolean isPackaged()
 	{
 		return _packaged;
 	}
-
+	
 	public void setPackaged(boolean value)
 	{
 		_packaged = value;
 	}
-
+	
 	/**
 	 * Retrieves items from TradeList
 	 */
@@ -234,7 +235,7 @@ public class TradeList
 	{
 		return _items.toArray(new TradeItem[_items.size()]);
 	}
-
+	
 	/**
 	 * Returns the list of items in inventory available for transaction
 	 * @return L2ItemInstance : items in inventory
@@ -248,10 +249,10 @@ public class TradeList
 			inventory.adjustAvailableItem(item);
 			list.add(item);
 		}
-
+		
 		return list.toArray(new TradeList.TradeItem[list.size()]);
 	}
-
+	
 	/**
 	 * Returns Item List size
 	 */
@@ -259,7 +260,7 @@ public class TradeList
 	{
 		return _items.size();
 	}
-
+	
 	/**
 	 * Adjust available item from Inventory by the one in this list
 	 * @param item : L2ItemInstance to be adjusted
@@ -275,13 +276,14 @@ public class TradeList
 				{
 					if (item.getCount() <= exclItem.getCount())
 						return null;
-					else return new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice());
+					else
+						return new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice());
 				}
 			}
 		}
 		return new TradeItem(item, item.getCount(), item.getReferencePrice());
 	}
-
+	
 	/**
 	 * Adjust ItemRequest by corresponding item in this list using its <b>ObjectId</b>
 	 * @param item : ItemRequest to be adjusted
@@ -299,7 +301,7 @@ public class TradeList
 		}
 		item.setCount(0);
 	}
-
+	
 	/**
 	 * Add simplified item to TradeList
 	 * @param objectId : int
@@ -310,7 +312,7 @@ public class TradeList
 	{
 		return addItem(objectId, count, 0);
 	}
-
+	
 	/**
 	 * Add item to TradeList
 	 * @param objectId : int
@@ -325,49 +327,48 @@ public class TradeList
 			_log.warning(_owner.getName() + ": Attempt to modify locked TradeList!");
 			return null;
 		}
-
+		
 		L2Object o = L2World.getInstance().findObject(objectId);
 		if (!(o instanceof L2ItemInstance))
 		{
 			_log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!");
 			return null;
 		}
-
-		L2ItemInstance item = (L2ItemInstance)o;
-
-		if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS))
-				|| item.getItemType() == L2EtcItemType.QUEST)
+		
+		L2ItemInstance item = (L2ItemInstance) o;
+		
+		if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.getItemType() == L2EtcItemType.QUEST)
 			return null;
-
+		
 		if (count <= 0 || count > item.getCount())
 			return null;
-
+		
 		if (!item.isStackable() && count > 1)
 		{
 			_log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!");
 			return null;
 		}
-
+		
 		if ((PcInventory.MAX_ADENA / count) < price)
 		{
 			_log.warning(_owner.getName() + ": Attempt to overflow adena !");
 			return null;
 		}
-
+		
 		for (TradeItem checkitem : _items)
 		{
 			if (checkitem.getObjectId() == objectId)
 				return null;
 		}
-
+		
 		TradeItem titem = new TradeItem(item, count, price);
 		_items.add(titem);
-
+		
 		// If Player has already confirmed this trade, invalidate the confirmation
 		invalidateConfirmation();
 		return titem;
 	}
-
+	
 	/**
 	 * Add item to TradeList
 	 * @param objectId : int
@@ -382,37 +383,37 @@ public class TradeList
 			_log.warning(_owner.getName() + ": Attempt to modify locked TradeList!");
 			return null;
 		}
-
+		
 		L2Item item = ItemTable.getInstance().getTemplate(itemId);
 		if (item == null)
 		{
 			_log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!");
 			return null;
 		}
-
+		
 		if (!item.isTradeable() || item.getItemType() == L2EtcItemType.QUEST)
 			return null;
-
+		
 		if (!item.isStackable() && count > 1)
 		{
 			_log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!");
 			return null;
 		}
-
+		
 		if ((PcInventory.MAX_ADENA / count) < price)
 		{
 			_log.warning(_owner.getName() + ": Attempt to overflow adena !");
 			return null;
 		}
-
+		
 		TradeItem titem = new TradeItem(item, count, price);
 		_items.add(titem);
-
+		
 		// If Player has already confirmed this trade, invalidate the confirmation
 		invalidateConfirmation();
 		return titem;
 	}
-
+	
 	/**
 	 * Remove item from TradeList
 	 * @param objectId : int
@@ -426,11 +427,10 @@ public class TradeList
 			_log.warning(_owner.getName() + ": Attempt to modify locked TradeList!");
 			return null;
 		}
-
+		
 		for (TradeItem titem : _items)
 		{
-			if (titem.getObjectId() == objectId
-					|| titem.getItem().getItemId() == itemId)
+			if (titem.getObjectId() == objectId || titem.getItem().getItemId() == itemId)
 			{
 				// If Partner has already confirmed this trade, invalidate the confirmation
 				if (_partner != null)
@@ -443,18 +443,19 @@ public class TradeList
 					}
 					partnerList.invalidateConfirmation();
 				}
-
+				
 				// Reduce item count or complete item
 				if (count != -1 && titem.getCount() > count)
 					titem.setCount(titem.getCount() - count);
-				else _items.remove(titem);
-
+				else
+					_items.remove(titem);
+				
 				return titem;
 			}
 		}
 		return null;
 	}
-
+	
 	/**
 	 * Update items in TradeList according their quantity in owner inventory
 	 */
@@ -469,7 +470,7 @@ public class TradeList
 				titem.setCount(item.getCount());
 		}
 	}
-
+	
 	/**
 	 * Lockes TradeList, no further changes are allowed
 	 */
@@ -477,7 +478,7 @@ public class TradeList
 	{
 		_locked = true;
 	}
-
+	
 	/**
 	 * Clears item list
 	 */
@@ -486,7 +487,7 @@ public class TradeList
 		_items.clear();
 		_locked = false;
 	}
-
+	
 	/**
 	 * Confirms TradeList
 	 * @return : boolean
@@ -495,7 +496,7 @@ public class TradeList
 	{
 		if (_confirmed)
 			return true; // Already confirmed
-
+			
 		// If Partner has already confirmed this trade, proceed exchange
 		if (_partner != null)
 		{
@@ -505,18 +506,20 @@ public class TradeList
 				_log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!");
 				return false;
 			}
-
+			
 			// Synchronization order to avoid deadlock
 			TradeList sync1, sync2;
 			if (getOwner().getObjectId() > partnerList.getOwner().getObjectId())
 			{
-				sync1 = partnerList; sync2 = this;
+				sync1 = partnerList;
+				sync2 = this;
 			}
 			else
 			{
-				sync1 = this; sync2 = partnerList;
+				sync1 = this;
+				sync2 = partnerList;
 			}
-
+			
 			synchronized (sync1)
 			{
 				synchronized (sync2)
@@ -530,18 +533,20 @@ public class TradeList
 							return false;
 						if (!validate())
 							return false;
-
+						
 						doExchange(partnerList);
 					}
-					else _partner.onTradeConfirm(_owner);
+					else
+						_partner.onTradeConfirm(_owner);
 				}
 			}
 		}
-		else _confirmed = true;
-
+		else
+			_confirmed = true;
+		
 		return _confirmed;
 	}
-
+	
 	/**
 	 * Cancels TradeList confirmation
 	 */
@@ -549,7 +554,7 @@ public class TradeList
 	{
 		_confirmed = false;
 	}
-
+	
 	/**
 	 * Validates TradeList with owner inventory
 	 */
@@ -561,7 +566,7 @@ public class TradeList
 			_log.warning("Invalid owner of TradeList");
 			return false;
 		}
-
+		
 		// Check for Item validity
 		for (TradeItem titem : _items)
 		{
@@ -572,10 +577,10 @@ public class TradeList
 				return false;
 			}
 		}
-
+		
 		return true;
 	}
-
+	
 	/**
 	 * Transfers all TradeItems from inventory to partner
 	 */
@@ -589,32 +594,34 @@ public class TradeList
 			L2ItemInstance newItem = _owner.getInventory().transferItem("Trade", titem.getObjectId(), titem.getCount(), partner.getInventory(), _owner, _partner);
 			if (newItem == null)
 				return false;
-
+			
 			// Add changes to inventory update packets
 			if (ownerIU != null)
 			{
 				if (oldItem.getCount() > 0 && oldItem != newItem)
 					ownerIU.addModifiedItem(oldItem);
-				else ownerIU.addRemovedItem(oldItem);
+				else
+					ownerIU.addRemovedItem(oldItem);
 			}
-
+			
 			if (partnerIU != null)
 			{
 				if (newItem.getCount() > titem.getCount())
 					partnerIU.addModifiedItem(newItem);
-				else partnerIU.addNewItem(newItem);
+				else
+					partnerIU.addNewItem(newItem);
 			}
 		}
 		return true;
 	}
-
+	
 	/**
 	 * Count items slots
 	 */
 	public int countItemsSlots(L2PcInstance partner)
 	{
 		int slots = 0;
-
+		
 		for (TradeItem item : _items)
 		{
 			if (item == null)
@@ -627,17 +634,17 @@ public class TradeList
 			else if (partner.getInventory().getItemByItemId(item.getItem().getItemId()) == null)
 				slots++;
 		}
-
+		
 		return slots;
 	}
-
+	
 	/**
 	 * Calc weight of items in tradeList
 	 */
 	public int calcItemsWeight()
 	{
 		long weight = 0;
-
+		
 		for (TradeItem item : _items)
 		{
 			if (item == null)
@@ -647,26 +654,24 @@ public class TradeList
 				continue;
 			weight += item.getCount() * template.getWeight();
 		}
-
-		return (int)Math.min(weight, Integer.MAX_VALUE);
+		
+		return (int) Math.min(weight, Integer.MAX_VALUE);
 	}
-
+	
 	/**
 	 * Proceeds with trade
 	 */
 	private void doExchange(TradeList partnerList)
 	{
 		boolean success = false;
-
+		
 		// check weight and slots
-		if ((!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight()))
-				|| !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())))
+		if ((!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())))
 		{
 			partnerList.getOwner().sendPacket(new SystemMessage(SystemMessageId.WEIGHT_LIMIT_EXCEEDED));
 			getOwner().sendPacket(new SystemMessage(SystemMessageId.WEIGHT_LIMIT_EXCEEDED));
 		}
-		else if ((!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner())))
-				|| (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))))
+		else if ((!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))))
 		{
 			partnerList.getOwner().sendPacket(new SystemMessage(SystemMessageId.SLOTS_FULL));
 			getOwner().sendPacket(new SystemMessage(SystemMessageId.SLOTS_FULL));
@@ -676,20 +681,22 @@ public class TradeList
 			// Prepare inventory update packet
 			InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
 			InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-
+			
 			// Transfer items
 			partnerList.TransferItems(getOwner(), partnerIU, ownerIU);
 			TransferItems(partnerList.getOwner(), ownerIU, partnerIU);
-
+			
 			// Send inventory update packet
 			if (ownerIU != null)
 				_owner.sendPacket(ownerIU);
-			else _owner.sendPacket(new ItemList(_owner, false));
-
+			else
+				_owner.sendPacket(new ItemList(_owner, false));
+			
 			if (partnerIU != null)
 				_partner.sendPacket(partnerIU);
-			else _partner.sendPacket(new ItemList(_partner, false));
-
+			else
+				_partner.sendPacket(new ItemList(_partner, false));
+			
 			// Update current load as well
 			StatusUpdate playerSU = new StatusUpdate(_owner.getObjectId());
 			playerSU.addAttribute(StatusUpdate.CUR_LOAD, _owner.getCurrentLoad());
@@ -697,14 +704,14 @@ public class TradeList
 			playerSU = new StatusUpdate(_partner.getObjectId());
 			playerSU.addAttribute(StatusUpdate.CUR_LOAD, _partner.getCurrentLoad());
 			_partner.sendPacket(playerSU);
-
+			
 			success = true;
 		}
 		// Finish the trade
 		partnerList.getOwner().onTradeFinish(success);
 		getOwner().onTradeFinish(success);
 	}
-
+	
 	/**
 	 * Buy items from this PrivateStore list
 	 * @return : boolean true if success
@@ -713,24 +720,24 @@ public class TradeList
 	{
 		if (_locked)
 			return false;
-
+		
 		if (!validate())
 		{
 			lock();
 			return false;
 		}
-
+		
 		int slots = 0;
 		int weight = 0;
 		long totalPrice = 0;
-
+		
 		final PcInventory ownerInventory = _owner.getInventory();
 		final PcInventory playerInventory = player.getInventory();
-
+		
 		for (ItemRequest item : items)
 		{
 			boolean found = false;
-
+			
 			for (TradeItem ti : _items)
 			{
 				if (ti.getObjectId() == item.getObjectId())
@@ -747,10 +754,16 @@ public class TradeList
 			// item with this objectId and price not found in tradelist
 			if (!found)
 			{
+				if (isPackaged())
+				{
+					Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH);
+					return false;
+				}
+				
 				item.setCount(0);
 				continue;
 			}
-
+			
 			// check for overflow in the single item
 			if ((MAX_ADENA / item.getCount()) < item.getPrice())
 			{
@@ -758,17 +771,16 @@ public class TradeList
 				lock();
 				return false;
 			}
-
+			
 			totalPrice += item.getCount() * item.getPrice();
 			// check for overflow of the total price
-			if (MAX_ADENA < totalPrice
-					|| totalPrice < 0)
+			if (MAX_ADENA < totalPrice || totalPrice < 0)
 			{
 				// private store attempting to overflow - disable it
 				lock();
 				return false;
 			}
-
+			
 			// Check if requested item is available for manipulation
 			L2ItemInstance oldItem = _owner.checkItemManipulation(item.getObjectId(), item.getCount(), "sell");
 			if (oldItem == null || !oldItem.isTradeable())
@@ -777,7 +789,7 @@ public class TradeList
 				lock();
 				return false;
 			}
-
+			
 			L2Item template = ItemTable.getInstance().getTemplate(item.getItemId());
 			if (template == null)
 				continue;
@@ -787,43 +799,43 @@ public class TradeList
 			else if (playerInventory.getItemByItemId(item.getItemId()) == null)
 				slots++;
 		}
-
+		
 		if (totalPrice > playerInventory.getAdena())
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.YOU_NOT_ENOUGH_ADENA));
 			return false;
 		}
-
+		
 		if (!playerInventory.validateWeight(weight))
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.WEIGHT_LIMIT_EXCEEDED));
 			return false;
 		}
-
+		
 		if (!playerInventory.validateCapacity(slots))
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.SLOTS_FULL));
 			return false;
 		}
-
+		
 		// Prepare inventory update packets
 		final InventoryUpdate ownerIU = new InventoryUpdate();
 		final InventoryUpdate playerIU = new InventoryUpdate();
-
+		
 		final L2ItemInstance adenaItem = playerInventory.getAdenaInstance();
 		playerInventory.reduceAdena("PrivateStore", totalPrice, player, _owner);
 		playerIU.addItem(adenaItem);
 		ownerInventory.addAdena("PrivateStore", totalPrice, _owner, player);
 		ownerIU.addItem(ownerInventory.getAdenaInstance());
-
+		
 		boolean ok = true;
-
+		
 		// Transfer items
 		for (ItemRequest item : items)
 		{
 			if (item.getCount() == 0)
 				continue;
-
+			
 			// Check if requested item is available for manipulation
 			L2ItemInstance oldItem = _owner.checkItemManipulation(item.getObjectId(), item.getCount(), "sell");
 			if (oldItem == null)
@@ -833,7 +845,7 @@ public class TradeList
 				ok = false;
 				break;
 			}
-
+			
 			// Proceed with item transfer
 			L2ItemInstance newItem = ownerInventory.transferItem("PrivateStore", item.getObjectId(), item.getCount(), playerInventory, _owner, player);
 			if (newItem == null)
@@ -842,15 +854,17 @@ public class TradeList
 				break;
 			}
 			removeItem(item.getObjectId(), -1, item.getCount());
-
+			
 			// Add changes to inventory update packets
 			if (oldItem.getCount() > 0 && oldItem != newItem)
 				ownerIU.addModifiedItem(oldItem);
-			else ownerIU.addRemovedItem(oldItem);
+			else
+				ownerIU.addRemovedItem(oldItem);
 			if (newItem.getCount() > item.getCount())
 				playerIU.addModifiedItem(newItem);
-			else playerIU.addNewItem(newItem);
-
+			else
+				playerIU.addNewItem(newItem);
+			
 			// Send messages about the transaction to both players
 			if (newItem.isStackable())
 			{
@@ -859,7 +873,7 @@ public class TradeList
 				msg.addItemName(newItem);
 				msg.addItemNumber(item.getCount());
 				_owner.sendPacket(msg);
-
+				
 				msg = new SystemMessage(SystemMessageId.PURCHASED_S3_S2_S_FROM_C1);
 				msg.addString(_owner.getName());
 				msg.addItemName(newItem);
@@ -872,20 +886,20 @@ public class TradeList
 				msg.addString(player.getName());
 				msg.addItemName(newItem);
 				_owner.sendPacket(msg);
-
+				
 				msg = new SystemMessage(SystemMessageId.PURCHASED_S2_FROM_C1);
 				msg.addString(_owner.getName());
 				msg.addItemName(newItem);
 				player.sendPacket(msg);
 			}
 		}
-
+		
 		// Send inventory update packet
 		_owner.sendPacket(ownerIU);
 		player.sendPacket(playerIU);
 		return ok;
 	}
-
+	
 	/**
 	 * Sell items to this PrivateStore list
 	 * @return : boolean true if success
@@ -894,23 +908,23 @@ public class TradeList
 	{
 		if (_locked)
 			return false;
-
+		
 		boolean ok = false;
-
+		
 		final PcInventory ownerInventory = _owner.getInventory();
 		final PcInventory playerInventory = player.getInventory();
-
+		
 		// Prepare inventory update packet
 		final InventoryUpdate ownerIU = new InventoryUpdate();
 		final InventoryUpdate playerIU = new InventoryUpdate();
-
+		
 		long totalPrice = 0;
-
+		
 		for (ItemRequest item : items)
 		{
 			// searching item in tradelist using itemId
 			boolean found = false;
-
+			
 			for (TradeItem ti : _items)
 			{
 				if (ti.getItem().getItemId() == item.getItemId())
@@ -930,26 +944,25 @@ public class TradeList
 			// maybe another player already sold this item ?
 			if (!found)
 				continue;
-
+			
 			// check for overflow in the single item
 			if ((MAX_ADENA / item.getCount()) < item.getPrice())
 			{
 				lock();
 				break;
 			}
-
+			
 			long _totalPrice = totalPrice + item.getCount() * item.getPrice();
 			// check for overflow of the total price
-			if (MAX_ADENA < _totalPrice
-					|| _totalPrice < 0)
+			if (MAX_ADENA < _totalPrice || _totalPrice < 0)
 			{
 				lock();
 				break;
 			}
-
+			
 			if (ownerInventory.getAdena() < _totalPrice)
 				continue;
-
+			
 			// Check if requested item is available for manipulation
 			int objectId = item.getObjectId();
 			L2ItemInstance oldItem = player.checkItemManipulation(objectId, item.getCount(), "sell");
@@ -965,29 +978,31 @@ public class TradeList
 				if (oldItem == null)
 					continue;
 			}
-
+			
 			if (!oldItem.isTradeable())
 				continue;
-
+			
 			// Proceed with item transfer
 			L2ItemInstance newItem = playerInventory.transferItem("PrivateStore", objectId, item.getCount(), ownerInventory, player, _owner);
 			if (newItem == null)
 				continue;
-
+			
 			removeItem(-1, item.getItemId(), item.getCount());
 			ok = true;
-
+			
 			// increase total price only after successful transaction
 			totalPrice = _totalPrice;
-
+			
 			// Add changes to inventory update packets
 			if (oldItem.getCount() > 0 && oldItem != newItem)
 				playerIU.addModifiedItem(oldItem);
-			else playerIU.addRemovedItem(oldItem);
+			else
+				playerIU.addRemovedItem(oldItem);
 			if (newItem.getCount() > item.getCount())
 				ownerIU.addModifiedItem(newItem);
-			else ownerIU.addNewItem(newItem);
-
+			else
+				ownerIU.addNewItem(newItem);
+			
 			// Send messages about the transaction to both players
 			if (newItem.isStackable())
 			{
@@ -996,7 +1011,7 @@ public class TradeList
 				msg.addItemName(newItem);
 				msg.addItemNumber(item.getCount());
 				_owner.sendPacket(msg);
-
+				
 				msg = new SystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
 				msg.addString(_owner.getName());
 				msg.addItemName(newItem);
@@ -1009,14 +1024,14 @@ public class TradeList
 				msg.addString(player.getName());
 				msg.addItemName(newItem);
 				_owner.sendPacket(msg);
-
+				
 				msg = new SystemMessage(SystemMessageId.C1_PURCHASED_S2);
 				msg.addString(_owner.getName());
 				msg.addItemName(newItem);
 				player.sendPacket(msg);
 			}
 		}
-
+		
 		if (totalPrice > 0)
 		{
 			// Transfer adena
@@ -1029,7 +1044,7 @@ public class TradeList
 			playerInventory.addAdena("PrivateStore", totalPrice, player, _owner);
 			playerIU.addItem(playerInventory.getAdenaInstance());
 		}
-
+		
 		if (ok)
 		{
 			// Send inventory update packet

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/AddTradeItem.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.TradeOtherAdd;
 import com.l2jserver.gameserver.network.serverpackets.TradeOwnAdd;
 
-
 /**
  * This class ...
  *
@@ -34,15 +33,15 @@ public final class AddTradeItem extends L2GameClientPacket
 {
 	private static final String _C__16_ADDTRADEITEM = "[C] 16 AddTradeItem";
 	private static final Logger _log = Logger.getLogger(AddTradeItem.class.getName());
-
+	
 	private int _tradeId;
 	private int _objectId;
 	private long _count;
-
+	
 	public AddTradeItem()
 	{
 	}
-
+	
 	@Override
 	protected void readImpl()
 	{
@@ -50,57 +49,52 @@ public final class AddTradeItem extends L2GameClientPacket
 		_objectId = readD();
 		_count = readQ();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		final L2PcInstance player = getClient().getActiveChar();
 		if (player == null)
 			return;
-
+		
 		final TradeList trade = player.getActiveTradeList();
 		if (trade == null)
 		{
-			_log.warning("Character: " + player.getName()
-					+ " requested item:" + _objectId
-					+ " add without active tradelist:" + _tradeId);
+			_log.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId);
 			return;
 		}
-
+		
 		final L2PcInstance partner = trade.getPartner();
-		if (partner == null
-				|| L2World.getInstance().findObject(partner.getObjectId()) == null
-				|| partner.getActiveTradeList() == null)
+		if (partner == null || L2World.getInstance().findObject(partner.getObjectId()) == null || partner.getActiveTradeList() == null)
 		{
 			// Trade partner not found, cancel trade
 			if (partner != null)
-				_log.warning("Character:" + player.getName()
-						+ " requested invalid trade object: " + _objectId);
+				_log.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId);
 			SystemMessage msg = new SystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
 			player.sendPacket(msg);
 			player.cancelActiveTrade();
 			return;
 		}
-
+		
 		if (trade.isConfirmed() || partner.getActiveTradeList().isConfirmed())
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.CANNOT_ADJUST_ITEMS_AFTER_TRADE_CONFIRMED));
 			return;
 		}
-
+		
 		if (!player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disable for your Access Level");
 			player.cancelActiveTrade();
 			return;
 		}
-
+		
 		if (!player.validateItemManipulation(_objectId, "trade"))
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.NOTHING_HAPPENED));
 			return;
 		}
-
+		
 		final TradeList.TradeItem item = trade.addItem(_objectId, _count);
 		if (item != null)
 		{
@@ -108,7 +102,7 @@ public final class AddTradeItem extends L2GameClientPacket
 			trade.getPartner().sendPacket(new TradeOtherAdd(item));
 		}
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java

@@ -30,51 +30,51 @@ public final class AnswerTradeRequest extends L2GameClientPacket
 {
 	private static final String _C__40_ANSWERTRADEREQUEST = "[C] 40 AnswerTradeRequest";
 	//private static Logger _log = Logger.getLogger(AnswerTradeRequest.class.getName());
-
+	
 	private int _response;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_response = readD();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
-        if (player == null) return;
-
-        if (!player.getAccessLevel().allowTransaction())
-        {
-        	player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT));
-            sendPacket(ActionFailed.STATIC_PACKET);
-            return;
-        }
-
-
-        L2PcInstance partner = player.getActiveRequester();
-        if (partner == null)
-        {
-            // Trade partner not found, cancel trade
+		if (player == null)
+			return;
+		
+		if (!player.getAccessLevel().allowTransaction())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT));
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		L2PcInstance partner = player.getActiveRequester();
+		if (partner == null)
+		{
+			// Trade partner not found, cancel trade
 			player.sendPacket(new TradeDone(0));
-            SystemMessage msg = new SystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
-            player.sendPacket(msg);
+			SystemMessage msg = new SystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+			player.sendPacket(msg);
 			player.setActiveRequester(null);
 			msg = null;
-            return;
-        }
-        else if (L2World.getInstance().findObject(partner.getObjectId()) == null)
-        {
-        	// Trade partner not found, cancel trade
+			return;
+		}
+		else if (L2World.getInstance().findObject(partner.getObjectId()) == null)
+		{
+			// Trade partner not found, cancel trade
 			player.sendPacket(new TradeDone(0));
-            SystemMessage msg = new SystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
-            player.sendPacket(msg);
+			SystemMessage msg = new SystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+			player.sendPacket(msg);
 			player.setActiveRequester(null);
 			msg = null;
-            return;
-        }
-
+			return;
+		}
+		
 		if (_response == 1 && !partner.isRequestExpired())
 			player.startTrade(partner);
 		else
@@ -84,12 +84,12 @@ public final class AnswerTradeRequest extends L2GameClientPacket
 			partner.sendPacket(msg);
 			msg = null;
 		}
-
+		
 		// Clears requesting status
 		player.setActiveRequester(null);
 		partner.onTransactionResponse();
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.util.Util;
 
-
 import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
 
 /**
@@ -37,31 +36,29 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket
 {
 	private static final String _C__79_REQUESTPRIVATESTOREBUY = "[C] 79 RequestPrivateStoreBuy";
 	private static Logger _log = Logger.getLogger(RequestPrivateStoreBuy.class.getName());
-
+	
 	private static final int BATCH_LENGTH = 20; // length of the one item
-
+	
 	private int _storePlayerId;
 	private ItemRequest[] _items = null;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_storePlayerId = readD();
 		int count = readD();
-		if (count <= 0
-				|| count > Config.MAX_ITEM_IN_PACKET
-				|| count * BATCH_LENGTH != _buf.remaining())
+		if (count <= 0 || count > Config.MAX_ITEM_IN_PACKET || count * BATCH_LENGTH != _buf.remaining())
 		{
 			return;
 		}
 		_items = new ItemRequest[count];
-
-		for (int i = 0; i < count ; i++)
+		
+		for (int i = 0; i < count; i++)
 		{
 			int objectId = readD();
 			long cnt = readQ();
 			long price = readQ();
-
+			
 			if (objectId < 1 || cnt < 1 || price < 0)
 			{
 				_items = null;
@@ -70,112 +67,111 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket
 			_items[i] = new ItemRequest(objectId, cnt, price);
 		}
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
 		if (player == null)
 			return;
-
-		if(_items == null)
+		
+		if (_items == null)
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
-
+		
 		if (!player.getFloodProtectors().getTransaction().tryPerformAction("privatestorebuy"))
 		{
 			player.sendMessage("You buying items too fast.");
 			return;
 		}
-
+		
 		L2Object object = L2World.getInstance().findObject(_storePlayerId);
 		if (!(object instanceof L2PcInstance))
 			return;
-
-		if(player.isCursedWeaponEquipped())
+		
+		if (player.isCursedWeaponEquipped())
 			return;
-
-		L2PcInstance storePlayer = (L2PcInstance)object;
+		
+		L2PcInstance storePlayer = (L2PcInstance) object;
 		if (!player.isInsideRadius(storePlayer, INTERACTION_DISTANCE, true, false))
 			return;
-
-		if (player.getInstanceId() != storePlayer.getInstanceId()
-				&& player.getInstanceId() != -1)
+		
+		if (player.getInstanceId() != storePlayer.getInstanceId() && player.getInstanceId() != -1)
 			return;
-
+		
 		if (!(storePlayer.getPrivateStoreType() == L2PcInstance.STORE_PRIVATE_SELL || storePlayer.getPrivateStoreType() == L2PcInstance.STORE_PRIVATE_PACKAGE_SELL))
 			return;
-
+		
 		TradeList storeList = storePlayer.getSellList();
 		if (storeList == null)
 			return;
-
+		
 		if (!player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disable for your Access Level");
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
-
+		
 		if (storePlayer.getPrivateStoreType() == L2PcInstance.STORE_PRIVATE_PACKAGE_SELL)
 		{
 			if (storeList.getItemCount() > _items.length)
 			{
-				String msgErr = "[RequestPrivateStoreBuy] player "+getClient().getActiveChar().getName()+" tried to buy less items then sold by package-sell, ban this player for bot-usage!";
-				Util.handleIllegalPlayerAction(getClient().getActiveChar(),msgErr,Config.DEFAULT_PUNISH);
+				String msgErr = "[RequestPrivateStoreBuy] player " + getClient().getActiveChar().getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!";
+				Util.handleIllegalPlayerAction(getClient().getActiveChar(), msgErr, Config.DEFAULT_PUNISH);
 				return;
 			}
 		}
-
+		
 		if (!storeList.privateStoreBuy(player, _items))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			_log.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName());
 			return;
 		}
-
+		
 		if (storeList.getItemCount() == 0)
 		{
 			storePlayer.setPrivateStoreType(L2PcInstance.STORE_PRIVATE_NONE);
 			storePlayer.broadcastUserInfo();
 		}
-
-/*   Lease holders are currently not implemented
-		else if (_seller != null)
-		{
-			// lease shop sell
-			L2MerchantInstance seller = (L2MerchantInstance)_seller;
-			L2ItemInstance ladena = seller.getLeaseAdena();
-			for (TradeItem ti : buyerlist) {
-				L2ItemInstance li = seller.getLeaseItemByObjectId(ti.getObjectId());
-				if (li == null) {
-					if (ti.getObjectId() == ladena.getObjectId())
-					{
-						buyer.addAdena(ti.getCount());
-						ladena.setCount(ladena.getCount()-ti.getCount());
+		
+		/*   Lease holders are currently not implemented
+				else if (_seller != null)
+				{
+					// lease shop sell
+					L2MerchantInstance seller = (L2MerchantInstance)_seller;
+					L2ItemInstance ladena = seller.getLeaseAdena();
+					for (TradeItem ti : buyerlist) {
+						L2ItemInstance li = seller.getLeaseItemByObjectId(ti.getObjectId());
+						if (li == null) {
+							if (ti.getObjectId() == ladena.getObjectId())
+							{
+								buyer.addAdena(ti.getCount());
+								ladena.setCount(ladena.getCount()-ti.getCount());
+								ladena.updateDatabase();
+							}
+							continue;
+						}
+						int cnt = li.getCount();
+						if (cnt < ti.getCount())
+							ti.setCount(cnt);
+						if (ti.getCount() <= 0)
+							continue;
+						L2ItemInstance inst = ItemTable.getInstance().createItem(li.getItemId());
+						inst.setCount(ti.getCount());
+						inst.setEnchantLevel(li.getEnchantLevel());
+						buyer.getInventory().addItem(inst);
+						li.setCount(li.getCount()-ti.getCount());
+						li.updateDatabase();
+						ladena.setCount(ladena.getCount()+ti.getCount()*ti.getOwnersPrice());
 						ladena.updateDatabase();
 					}
-					continue;
-				}
-				int cnt = li.getCount();
-				if (cnt < ti.getCount())
-					ti.setCount(cnt);
-				if (ti.getCount() <= 0)
-					continue;
-				L2ItemInstance inst = ItemTable.getInstance().createItem(li.getItemId());
-				inst.setCount(ti.getCount());
-				inst.setEnchantLevel(li.getEnchantLevel());
-				buyer.getInventory().addItem(inst);
-				li.setCount(li.getCount()-ti.getCount());
-				li.updateDatabase();
-				ladena.setCount(ladena.getCount()+ti.getCount()*ti.getOwnersPrice());
-				ladena.updateDatabase();
-			}
-		}*/
+				}*/
 	}
-
+	
 	@Override
 	public String getType()
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java

@@ -24,24 +24,24 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 public final class RequestPrivateStoreManageBuy extends L2GameClientPacket
 {
 	private static final String _C__90_REQUESTPRIVATESTOREMANAGEBUY = "[C] 90 RequestPrivateStoreManageBuy";
+	
 	//private static Logger _log = Logger.getLogger(RequestPrivateStoreBuyManage.class.getName());
-
-
+	
 	@Override
 	protected void readImpl()
 	{
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
 		if (player != null)
-        {
-            player.tryOpenPrivateBuyStore();
-        }
+		{
+			player.tryOpenPrivateBuyStore();
+		}
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java

@@ -25,9 +25,9 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 public final class RequestPrivateStoreManageSell extends L2GameClientPacket
 {
 	private static final String _C__73_REQUESTPRIVATESTOREMANAGESELL = "[C] 73 RequestPrivateStoreManageSell";
+	
 	//private static Logger _log = Logger.getLogger(RequestPrivateStoreManage.class.getName());
-
-
+	
 	@Override
 	protected void readImpl()
 	{
@@ -35,35 +35,33 @@ public final class RequestPrivateStoreManageSell extends L2GameClientPacket
 		//readD();
 		//readQ();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
 		if (player == null)
-        {
-            
-        }
-
-        // Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
-        if (player.isAlikeDead())
-        {
-            sendPacket(ActionFailed.STATIC_PACKET);
-            return;
-        }
-
-        if (player.isInOlympiadMode())
-        {
-            sendPacket(ActionFailed.STATIC_PACKET);
-            return;
-        }
-        if (player.getMountType() != 0)
-        {
-        	return;
-        }
-        
+			return;
+		
+		// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
+		if (player.isAlikeDead())
+		{
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (player.isInOlympiadMode())
+		{
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		if (player.getMountType() != 0)
+		{
+			return;
+		}
+		
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java

@@ -24,31 +24,33 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 public class RequestPrivateStoreQuitBuy extends L2GameClientPacket
 {
 	private static final String _C__93_REQUESTPRIVATESTOREQUITBUY = "[C] 93 RequestPrivateStoreQuitBuy";
+	
 	//private static Logger _log = Logger.getLogger(RequestPrivateStoreQuitBuy.class.getName());
-
+	
 	@Override
 	protected void readImpl()
 	{
 		// trigger
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
-		if (player == null) return;
-
+		if (player == null)
+			return;
+		
 		player.setPrivateStoreType(L2PcInstance.STORE_PRIVATE_NONE);
 		player.standUp();
 		player.broadcastUserInfo();
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */
 	@Override
 	public String getType()
 	{
-		return _C__93_REQUESTPRIVATESTOREQUITBUY ;
+		return _C__93_REQUESTPRIVATESTOREQUITBUY;
 	}
 }

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java

@@ -24,25 +24,27 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 public final class RequestPrivateStoreQuitSell extends L2GameClientPacket
 {
 	private static final String _C__76_REQUESTPRIVATESTOREQUITSELL = "[C] 76 RequestPrivateStoreQuitSell";
+	
 	//private static Logger _log = Logger.getLogger(RequestPrivateStoreQuitSell.class.getName());
-
+	
 	@Override
 	protected void readImpl()
 	{
 		// trigger
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
-		if (player == null) return;
-
+		if (player == null)
+			return;
+		
 		player.setPrivateStoreType(L2PcInstance.STORE_PRIVATE_NONE);
 		player.standUp();
 		player.broadcastUserInfo();
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.TradeList;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 
-
 import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
 
 /**
@@ -36,25 +35,23 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket
 {
 	private static final String _C__96_REQUESTPRIVATESTORESELL = "[C] 96 RequestPrivateStoreSell";
 	private static Logger _log = Logger.getLogger(RequestPrivateStoreSell.class.getName());
-
+	
 	private static final int BATCH_LENGTH = 28; // length of the one item
-
+	
 	private int _storePlayerId;
 	private ItemRequest[] _items = null;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_storePlayerId = readD();
 		int count = readD();
-		if (count <= 0
-				|| count > Config.MAX_ITEM_IN_PACKET
-				|| count * BATCH_LENGTH != _buf.remaining())
+		if (count <= 0 || count > Config.MAX_ITEM_IN_PACKET || count * BATCH_LENGTH != _buf.remaining())
 		{
 			return;
 		}
 		_items = new ItemRequest[count];
-
+		
 		for (int i = 0; i < count; i++)
 		{
 			int objectId = readD();
@@ -63,7 +60,7 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket
 			readH(); //TODO analyse this
 			long cnt = readQ();
 			long price = readQ();
-
+			
 			if (objectId < 1 || itemId < 1 || cnt < 1 || price < 0)
 			{
 				_items = null;
@@ -72,69 +69,68 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket
 			_items[i] = new ItemRequest(objectId, itemId, cnt, price);
 		}
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
 		if (player == null)
 			return;
-
-		if(_items == null)
+		
+		if (_items == null)
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
-
+		
 		if (!player.getFloodProtectors().getTransaction().tryPerformAction("privatestoresell"))
 		{
 			player.sendMessage("You selling items too fast");
 			return;
 		}
-
+		
 		L2Object object = L2World.getInstance().findObject(_storePlayerId);
 		if (!(object instanceof L2PcInstance))
 			return;
-
-		L2PcInstance storePlayer = (L2PcInstance)object;
+		
+		L2PcInstance storePlayer = (L2PcInstance) object;
 		if (!player.isInsideRadius(storePlayer, INTERACTION_DISTANCE, true, false))
 			return;
-
-		if (player.getInstanceId() != storePlayer.getInstanceId()
-				&& player.getInstanceId() != -1)
+		
+		if (player.getInstanceId() != storePlayer.getInstanceId() && player.getInstanceId() != -1)
 			return;
-
+		
 		if (storePlayer.getPrivateStoreType() != L2PcInstance.STORE_PRIVATE_BUY)
 			return;
-
-		if(player.isCursedWeaponEquipped())
+		
+		if (player.isCursedWeaponEquipped())
 			return;
-
+		
 		TradeList storeList = storePlayer.getBuyList();
 		if (storeList == null)
 			return;
-
+		
 		if (!player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disable for your Access Level");
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
-
+		
 		if (!storeList.privateStoreSell(player, _items))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			_log.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName());
 			return;
 		}
-
+		
 		if (storeList.getItemCount() == 0)
 		{
 			storePlayer.setPrivateStoreType(L2PcInstance.STORE_PRIVATE_NONE);
 			storePlayer.broadcastUserInfo();
 		}
 	}
-
+	
 	@Override
 	public String getType()
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java

@@ -38,18 +38,16 @@ import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.MAX_ADENA
 public final class SetPrivateStoreListBuy extends L2GameClientPacket
 {
 	private static final String _C__91_SETPRIVATESTORELISTBUY = "[C] 91 SetPrivateStoreListBuy";
-
+	
 	private static final int BATCH_LENGTH = 40; // length of the one item
-
+	
 	private Item[] _items = null;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		int count = readD();
-		if (count < 1
-				|| count > Config.MAX_ITEM_IN_PACKET
-				|| count * BATCH_LENGTH != _buf.remaining())
+		if (count < 1 || count > Config.MAX_ITEM_IN_PACKET || count * BATCH_LENGTH != _buf.remaining())
 		{
 			return;
 		}
@@ -62,7 +60,7 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket
 			readH();//TODO analyse this
 			long cnt = readQ();
 			long price = readQ();
-
+			
 			if (itemId < 1 || cnt < 1 || price < 0)
 			{
 				_items = null;
@@ -72,25 +70,25 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket
 			readD(); // FF 00 00 00
 			readD(); // 00 00 00 00
 			readB(new byte[7]); // Completely Unknown
-
+			
 			_items[i] = new Item(itemId, cnt, price);
 		}
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
 		if (player == null)
 			return;
-
+		
 		if (_items == null)
 		{
 			player.setPrivateStoreType(L2PcInstance.STORE_PRIVATE_NONE);
 			player.broadcastUserInfo();
 			return;
 		}
-
+		
 		if (!player.getAccessLevel().allowTransaction())
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT));
@@ -104,7 +102,7 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
-
+		
 		if (player.isInsideZone(L2Character.ZONE_NOSTORE))
 		{
 			player.sendPacket(new PrivateStoreManageListBuy(player));
@@ -112,10 +110,10 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
-
+		
 		TradeList tradeList = player.getBuyList();
 		tradeList.clear();
-
+		
 		// Check maximum number of allowed slots for pvt shops
 		if (_items.length > player.getPrivateBuyStoreLimit())
 		{
@@ -123,32 +121,24 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket
 			player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED));
 			return;
 		}
-
+		
 		long totalCost = 0;
 		for (Item i : _items)
 		{
 			if (!i.addToTradeList(tradeList))
 			{
-				Util.handleIllegalPlayerAction(player, "Warning!! Character "
-						+ player.getName() + " of account "
-						+ player.getAccountName() + " tried to set price more than "
-						+ MAX_ADENA + " adena in Private Store - Buy.",
-						Config.DEFAULT_PUNISH);
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Store - Buy.", Config.DEFAULT_PUNISH);
 				return;
 			}
-
+			
 			totalCost += i.getCost();
 			if (totalCost > MAX_ADENA)
 			{
-				Util.handleIllegalPlayerAction(player, "Warning!! Character "
-						+ player.getName() + " of account "
-						+ player.getAccountName() + " tried to set total price more than "
-						+ MAX_ADENA + " adena in Private Store - Buy.",
-						Config.DEFAULT_PUNISH);
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set total price more than " + MAX_ADENA + " adena in Private Store - Buy.", Config.DEFAULT_PUNISH);
 				return;
 			}
 		}
-
+		
 		// Check for available funds
 		if (totalCost > player.getAdena())
 		{
@@ -156,13 +146,13 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket
 			player.sendPacket(new SystemMessage(SystemMessageId.THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY));
 			return;
 		}
-
+		
 		player.sitDown();
 		player.setPrivateStoreType(L2PcInstance.STORE_PRIVATE_BUY);
 		player.broadcastUserInfo();
 		player.broadcastPacket(new PrivateStoreMsgBuy(player));
 	}
-
+	
 	private class Item
 	{
 		private final int _itemId;
@@ -175,22 +165,22 @@ public final class SetPrivateStoreListBuy extends L2GameClientPacket
 			_count = num;
 			_price = pri;
 		}
-
+		
 		public boolean addToTradeList(TradeList list)
 		{
 			if ((MAX_ADENA / _count) < _price)
 				return false;
-
+			
 			list.addItemByItemId(_itemId, _count, _price);
 			return true;
 		}
-
+		
 		public long getCost()
 		{
 			return _count * _price;
 		}
 	}
-
+	
 	@Override
 	public String getType()
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java

@@ -37,31 +37,29 @@ import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.MAX_ADENA
 public class SetPrivateStoreListSell extends L2GameClientPacket
 {
 	private static final String _C__74_SETPRIVATESTORELISTSELL = "[C] 74 SetPrivateStoreListSell";
-
+	
 	private static final int BATCH_LENGTH = 20; // length of the one item
-
+	
 	private boolean _packageSale;
 	private Item[] _items = null;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_packageSale = (readD() == 1);
 		int count = readD();
-		if (count < 1
-				|| count > Config.MAX_ITEM_IN_PACKET
-				|| count * BATCH_LENGTH != _buf.remaining())
+		if (count < 1 || count > Config.MAX_ITEM_IN_PACKET || count * BATCH_LENGTH != _buf.remaining())
 		{
 			return;
 		}
-
+		
 		_items = new Item[count];
-		for (int i = 0; i < count ; i++)
+		for (int i = 0; i < count; i++)
 		{
 			int itemId = readD();
 			long cnt = readQ();
 			long price = readQ();
-
+			
 			if (itemId < 1 || cnt < 1 || price < 0)
 			{
 				_items = null;
@@ -70,14 +68,14 @@ public class SetPrivateStoreListSell extends L2GameClientPacket
 			_items[i] = new Item(itemId, cnt, price);
 		}
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
 		if (player == null)
 			return;
-
+		
 		if (_items == null)
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.INCORRECT_ITEM_COUNT));
@@ -85,7 +83,7 @@ public class SetPrivateStoreListSell extends L2GameClientPacket
 			player.broadcastUserInfo();
 			return;
 		}
-
+		
 		if (!player.getAccessLevel().allowTransaction())
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT));
@@ -99,7 +97,7 @@ public class SetPrivateStoreListSell extends L2GameClientPacket
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
-
+		
 		if (player.isInsideZone(L2Character.ZONE_NOSTORE))
 		{
 			player.sendPacket(new PrivateStoreManageListSell(player, _packageSale));
@@ -107,7 +105,7 @@ public class SetPrivateStoreListSell extends L2GameClientPacket
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
-
+		
 		// Check maximum number of allowed slots for pvt shops
 		if (_items.length > player.getPrivateSellStoreLimit())
 		{
@@ -115,50 +113,42 @@ public class SetPrivateStoreListSell extends L2GameClientPacket
 			player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED));
 			return;
 		}
-
+		
 		TradeList tradeList = player.getSellList();
 		tradeList.clear();
 		tradeList.setPackaged(_packageSale);
-
+		
 		long totalCost = player.getAdena();
 		for (Item i : _items)
 		{
 			if (!i.addToTradeList(tradeList))
 			{
-				Util.handleIllegalPlayerAction(player, "Warning!! Character "
-						+ player.getName() + " of account "
-						+ player.getAccountName() + " tried to set price more than "
-						+ MAX_ADENA + " adena in Private Store - Sell.",
-						Config.DEFAULT_PUNISH);
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Store - Sell.", Config.DEFAULT_PUNISH);
 				return;
 			}
-
+			
 			totalCost += i.getPrice();
 			if (totalCost > MAX_ADENA)
 			{
-				Util.handleIllegalPlayerAction(player, "Warning!! Character "
-						+ player.getName() + " of account "
-						+ player.getAccountName() + " tried to set total price more than "
-						+ MAX_ADENA + " adena in Private Store - Sell.",
-						Config.DEFAULT_PUNISH);
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set total price more than " + MAX_ADENA + " adena in Private Store - Sell.", Config.DEFAULT_PUNISH);
 				return;
 			}
 		}
-
+		
 		player.sitDown();
 		if (_packageSale)
 			player.setPrivateStoreType(L2PcInstance.STORE_PRIVATE_PACKAGE_SELL);
 		else
 			player.setPrivateStoreType(L2PcInstance.STORE_PRIVATE_SELL);
-
+		
 		player.broadcastUserInfo();
-
+		
 		if (_packageSale)
 			player.broadcastPacket(new ExPrivateStoreSetWholeMsg(player));
 		else
 			player.broadcastPacket(new PrivateStoreMsgSell(player));
 	}
-
+	
 	private class Item
 	{
 		private final int _itemId;
@@ -171,22 +161,22 @@ public class SetPrivateStoreListSell extends L2GameClientPacket
 			_count = num;
 			_price = pri;
 		}
-
+		
 		public boolean addToTradeList(TradeList list)
 		{
 			if ((MAX_ADENA / _count) < _price)
 				return false;
-
+			
 			list.addItem(_itemId, _count, _price);
 			return true;
 		}
-
+		
 		public long getPrice()
 		{
 			return _count * _price;
 		}
 	}
-
+	
 	@Override
 	public String getType()
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java

@@ -26,25 +26,26 @@ public final class SetPrivateStoreMsgBuy extends L2GameClientPacket
 {
 	private static final String _C__94_SETPRIVATESTOREMSGBUY = "[C] 94 SetPrivateStoreMsgBuy";
 	//private static Logger _log = Logger.getLogger(SetPrivateStoreMsgBuy.class.getName());
-
+	
 	private String _storeMsg;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_storeMsg = readS();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
-		if (player == null || player.getBuyList() == null) return;
-
+		if (player == null || player.getBuyList() == null)
+			return;
+		
 		player.getBuyList().setTitle(_storeMsg);
 		player.sendPacket(new PrivateStoreMsgBuy(player));
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */
@@ -53,5 +54,5 @@ public final class SetPrivateStoreMsgBuy extends L2GameClientPacket
 	{
 		return _C__94_SETPRIVATESTOREMSGBUY;
 	}
-
+	
 }

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java

@@ -26,25 +26,26 @@ public class SetPrivateStoreMsgSell extends L2GameClientPacket
 {
 	private static final String _C__77_SETPRIVATESTOREMSGSELL = "[C] 77 SetPrivateStoreMsgSell";
 	//private static Logger _log = Logger.getLogger(SetPrivateStoreMsgSell.class.getName());
-
+	
 	private String _storeMsg;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_storeMsg = readS();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
-		if (player == null || player.getSellList() == null) return;
-
+		if (player == null || player.getSellList() == null)
+			return;
+		
 		player.getSellList().setTitle(_storeMsg);
 		sendPacket(new PrivateStoreMsgSell(player));
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */
@@ -53,5 +54,5 @@ public class SetPrivateStoreMsgSell extends L2GameClientPacket
 	{
 		return _C__77_SETPRIVATESTOREMSGSELL;
 	}
-
+	
 }

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java

@@ -23,37 +23,38 @@ import com.l2jserver.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
  */
 public class SetPrivateStoreWholeMsg extends L2GameClientPacket
 {
-    private String _msg;
-    
-    /**
-     * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-     */
-    @Override
-    public String getType()
-    {
-        return "[C] D0:4D SetPrivateStoreWholeMsg";
-    }
-
-    /**
-     * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-     */
-    @Override
-    protected void readImpl()
-    {
-        _msg = readS();
-    }
-
-    /**
-     * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-     */
-    @Override
-    protected void runImpl()
-    {
-        L2PcInstance player = getClient().getActiveChar();
-        if (player == null || player.getSellList() == null) return;
-
-        player.getSellList().setTitle(_msg);
-        sendPacket(new ExPrivateStoreSetWholeMsg(player));
-    }
-    
+	private String _msg;
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return "[C] D0:4D SetPrivateStoreWholeMsg";
+	}
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
+	 */
+	@Override
+	protected void readImpl()
+	{
+		_msg = readS();
+	}
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
+	 */
+	@Override
+	protected void runImpl()
+	{
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null || player.getSellList() == null)
+			return;
+		
+		player.getSellList().setTitle(_msg);
+		sendPacket(new ExPrivateStoreSetWholeMsg(player));
+	}
+	
 }

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/TradeDone.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
-
 /**
  * This class ...
  *
@@ -33,73 +32,70 @@ public final class TradeDone extends L2GameClientPacket
 {
 	private static final String _C__17_TRADEDONE = "[C] 17 TradeDone";
 	private static Logger _log = Logger.getLogger(TradeDone.class.getName());
-
+	
 	private int _response;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_response = readD();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		final L2PcInstance player = getClient().getActiveChar();
 		if (player == null)
 			return;
-
+		
 		if (!player.getFloodProtectors().getTransaction().tryPerformAction("trade"))
 		{
 			player.sendMessage("You trading too fast.");
 			return;
 		}
-
+		
 		final TradeList trade = player.getActiveTradeList();
 		if (trade == null)
 		{
 			if (Config.DEBUG)
-				_log.warning("player.getTradeList == null in "+getType()+" for player "+player.getName());
+				_log.warning("player.getTradeList == null in " + getType() + " for player " + player.getName());
 			return;
 		}
 		if (trade.isLocked())
 			return;
-
+		
 		if (_response == 1)
 		{
-			if (trade.getPartner() == null
-					|| L2World.getInstance().findObject(trade.getPartner().getObjectId()) == null)
+			if (trade.getPartner() == null || L2World.getInstance().findObject(trade.getPartner().getObjectId()) == null)
 			{
 				// Trade partner not found, cancel trade
 				player.cancelActiveTrade();
 				player.sendPacket(new SystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME));
 				return;
 			}
-
-			if (trade.getOwner().getActiveEnchantItem() != null
-					|| trade.getPartner().getActiveEnchantItem() != null)
+			
+			if (trade.getOwner().getActiveEnchantItem() != null || trade.getPartner().getActiveEnchantItem() != null)
 				return;
-
+			
 			if (!player.getAccessLevel().allowTransaction())
 			{
 				player.cancelActiveTrade();
 				player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT));
 				return;
 			}
-
-			if (player.getInstanceId() != trade.getPartner().getInstanceId()
-					&& player.getInstanceId() != -1)
+			
+			if (player.getInstanceId() != trade.getPartner().getInstanceId() && player.getInstanceId() != -1)
 			{
 				player.cancelActiveTrade();
 				return;
 			}
-
+			
 			trade.confirm();
 		}
 		else
 			player.cancelActiveTrade();
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/TradeRequest.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.network.serverpackets.SendTradeRequest;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Util;
 
-
 /**
  *
  * This class ...
@@ -38,113 +37,113 @@ public final class TradeRequest extends L2GameClientPacket
 {
 	private static final String TRADEREQUEST__C__15 = "[C] 15 TradeRequest";
 	private static Logger _log = Logger.getLogger(TradeRequest.class.getName());
-
+	
 	private int _objectId;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_objectId = readD();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
-        if (player == null) return;
-
-        if (!player.getAccessLevel().allowTransaction())
-        {
-        	player.sendMessage("Transactions are disable for your Access Level");
-            sendPacket(ActionFailed.STATIC_PACKET);
-            return;
-        }
-
-
+		if (player == null)
+			return;
+		
+		if (!player.getAccessLevel().allowTransaction())
+		{
+			player.sendMessage("Transactions are disable for your Access Level");
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
 		L2Object target = L2World.getInstance().findObject(_objectId);
-        if (target == null || !player.getKnownList().knowsObject(target)
-        		|| !(target instanceof L2PcInstance) || (target.getObjectId() == player.getObjectId()))
+		if (target == null || !player.getKnownList().knowsObject(target) || !(target instanceof L2PcInstance) || (target.getObjectId() == player.getObjectId()))
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
 			return;
 		}
-
-        L2PcInstance partner = (L2PcInstance)target;
-
-        // cant trade with players from other instance except from multiverse
-        if (partner.getInstanceId() != player.getInstanceId()
-        		&& player.getInstanceId() != -1)
-        	return;
-
-        if (partner.isInOlympiadMode() || player.isInOlympiadMode())
-        {
-            player.sendMessage("You or your target cant request trade in Olympiad mode");
-            return;
-        }
-
-        // Alt game - Karma punishment
-        if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TRADE && (player.getKarma() > 0 || partner.getKarma() > 0))
-        {
-        	player.sendMessage("Chaotic players can't use Trade.");
-            return;
-        }
-
-        if (Config.JAIL_DISABLE_TRANSACTION && (player.isInJail() || partner.isInJail()))
-        {
-        	player.sendMessage("You cannot trade in Jail.");
-        	return;
-        }
-
-        if (player.getPrivateStoreType() != 0 || partner.getPrivateStoreType() != 0)
-        {
-            player.sendPacket(new SystemMessage(SystemMessageId.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE));
-            return;
-        }
-
-        if (player.isProcessingTransaction())
+		
+		L2PcInstance partner = (L2PcInstance) target;
+		
+		// cant trade with players from other instance except from multiverse
+		if (partner.getInstanceId() != player.getInstanceId() && player.getInstanceId() != -1)
+			return;
+		
+		if (partner.isInOlympiadMode() || player.isInOlympiadMode())
+		{
+			player.sendMessage("You or your target cant request trade in Olympiad mode");
+			return;
+		}
+		
+		// Alt game - Karma punishment
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TRADE && (player.getKarma() > 0 || partner.getKarma() > 0))
 		{
-			if (Config.DEBUG) _log.fine("already trading with someone");
+			player.sendMessage("Chaotic players can't use Trade.");
+			return;
+		}
+		
+		if (Config.JAIL_DISABLE_TRANSACTION && (player.isInJail() || partner.isInJail()))
+		{
+			player.sendMessage("You cannot trade in Jail.");
+			return;
+		}
+		
+		if (player.getPrivateStoreType() != 0 || partner.getPrivateStoreType() != 0)
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE));
+			return;
+		}
+		
+		if (player.isProcessingTransaction())
+		{
+			if (Config.DEBUG)
+				_log.fine("already trading with someone");
 			player.sendPacket(new SystemMessage(SystemMessageId.ALREADY_TRADING));
 			return;
 		}
-
+		
 		if (partner.isProcessingRequest() || partner.isProcessingTransaction())
 		{
-			if (Config.DEBUG) _log.info("transaction already in progress.");
+			if (Config.DEBUG)
+				_log.info("transaction already in progress.");
 			SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_BUSY_TRY_LATER);
 			sm.addString(partner.getName());
 			player.sendPacket(sm);
-            return;
+			return;
 		}
-
-        if (partner.getTradeRefusal())
-        {
-            player.sendMessage("Target is in trade refusal mode");
-            return;
-        }
-        
-        if (BlockList.isBlocked(partner, player))
-        {
-        	SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_ADDED_YOU_TO_IGNORE_LIST);
-        	sm.addCharName(partner);
-        	player.sendPacket(sm);
-        	return;
-        }
-        
-        if (Util.calculateDistance(player, partner, true) > 150)
-        {
-        	SystemMessage sm = new SystemMessage(SystemMessageId.TARGET_TOO_FAR);
-        	player.sendPacket(sm);
-        	return;
-        }
-
+		
+		if (partner.getTradeRefusal())
+		{
+			player.sendMessage("Target is in trade refusal mode");
+			return;
+		}
+		
+		if (BlockList.isBlocked(partner, player))
+		{
+			SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_ADDED_YOU_TO_IGNORE_LIST);
+			sm.addCharName(partner);
+			player.sendPacket(sm);
+			return;
+		}
+		
+		if (Util.calculateDistance(player, partner, true) > 150)
+		{
+			SystemMessage sm = new SystemMessage(SystemMessageId.TARGET_TOO_FAR);
+			player.sendPacket(sm);
+			return;
+		}
+		
 		player.onTransactionRequest(partner);
 		partner.sendPacket(new SendTradeRequest(player.getObjectId()));
 		SystemMessage sm = new SystemMessage(SystemMessageId.REQUEST_C1_FOR_TRADE);
 		sm.addString(partner.getName());
 		player.sendPacket(sm);
 	}
-
+	
 	@Override
 	public String getType()
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java

@@ -22,39 +22,39 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class ExPrivateStoreSetWholeMsg extends L2GameServerPacket
 {
-    private final int _objectId;
-    private final String _msg;
-    
-    public ExPrivateStoreSetWholeMsg(L2PcInstance player, String msg)
-    {
-        _objectId = player.getObjectId();
-        _msg = msg;
-    }
-    
-    public ExPrivateStoreSetWholeMsg(L2PcInstance player)
-    {
-        this(player, player.getSellList().getTitle());
-    }
-    
-    /**
-     * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-     */
-    @Override
-    public String getType()
-    {
-        return "[S] FE:80 ExPrivateStoreSetWholeMsg";
-    }
-
-    /**
-     * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
-     */
-    @Override
-    protected void writeImpl()
-    {
-        writeC(0xfe);
-        writeH(0x80);
-        writeD(_objectId);
-        writeS(_msg);
-    }
-    
+	private final int _objectId;
+	private final String _msg;
+	
+	public ExPrivateStoreSetWholeMsg(L2PcInstance player, String msg)
+	{
+		_objectId = player.getObjectId();
+		_msg = msg;
+	}
+	
+	public ExPrivateStoreSetWholeMsg(L2PcInstance player)
+	{
+		this(player, player.getSellList().getTitle());
+	}
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return "[S] FE:80 ExPrivateStoreSetWholeMsg";
+	}
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
+	 */
+	@Override
+	protected void writeImpl()
+	{
+		writeC(0xfe);
+		writeH(0x80);
+		writeD(_objectId);
+		writeS(_msg);
+	}
+	
 }

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreListBuy.java

@@ -24,12 +24,12 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class PrivateStoreListBuy extends L2GameServerPacket
 {
-//	private static final String _S__D1_PRIVATEBUYLISTBUY = "[S] b8 PrivateBuyListBuy";
+	//	private static final String _S__D1_PRIVATEBUYLISTBUY = "[S] b8 PrivateBuyListBuy";
 	private static final String _S__D1_PRIVATESTORELISTBUY = "[S] be PrivateStoreListBuy";
 	private int _objId;
 	private long _playerAdena;
 	private TradeList.TradeItem[] _items;
-
+	
 	public PrivateStoreListBuy(L2PcInstance player, L2PcInstance storePlayer)
 	{
 		_objId = storePlayer.getObjectId();
@@ -37,44 +37,44 @@ public class PrivateStoreListBuy extends L2GameServerPacket
 		storePlayer.getSellList().updateItems(); // Update SellList for case inventory content has changed
 		_items = storePlayer.getBuyList().getAvailableItems(player.getInventory());
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0xbe);
 		writeD(_objId);
 		writeQ(_playerAdena);
-
+		
 		writeD(_items.length);
-
+		
 		for (TradeList.TradeItem item : _items)
 		{
 			writeD(item.getObjectId());
 			writeD(item.getItem().getItemId());
 			writeH(item.getEnchant());
 			writeQ(item.getCount()); //give max possible sell amount
-
+			
 			writeQ(item.getItem().getReferencePrice());
 			writeH(0);
-
+			
 			writeD(item.getItem().getBodyPart());
 			writeH(item.getItem().getType2());
 			writeQ(item.getPrice());//buyers price
-
-			writeQ(item.getStoreCount());  // maximum possible tradecount
+			
+			writeQ(item.getStoreCount()); // maximum possible tradecount
 			
 			// T1
 			writeH(item.getAttackElementType());
 			writeH(item.getAttackElementPower());
 			for (byte i = 0; i < 6; i++)
 				writeH(item.getElementDefAttr(i));
-
+			
 			writeH(0x00); // Enchant effect 1
 			writeH(0x00); // Enchant effect 2
 			writeH(0x00); // Enchant effect 3 
 		}
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreListSell.java

@@ -29,7 +29,7 @@ public class PrivateStoreListSell extends L2GameServerPacket
 	private long _playerAdena;
 	private boolean _packageSale;
 	private TradeList.TradeItem[] _items;
-
+	
 	// player's private shop
 	public PrivateStoreListSell(L2PcInstance player, L2PcInstance storePlayer)
 	{
@@ -38,7 +38,7 @@ public class PrivateStoreListSell extends L2GameServerPacket
 		_items = storePlayer.getSellList().getItems();
 		_packageSale = storePlayer.getSellList().isPackaged();
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
@@ -52,7 +52,7 @@ public class PrivateStoreListSell extends L2GameServerPacket
 			writeD(item.getItem().getType2());
 			writeD(item.getObjectId());
 			writeD(item.getItem().getItemId());
-            writeQ(item.getCount());
+			writeQ(item.getCount());
 			writeH(0x00);
 			writeH(item.getEnchant());
 			writeH(item.getCustomType2());
@@ -65,13 +65,13 @@ public class PrivateStoreListSell extends L2GameServerPacket
 			writeH(item.getAttackElementPower());
 			for (byte i = 0; i < 6; i++)
 				writeH(item.getElementDefAttr(i));
-
+			
 			writeH(0x00); // Enchant effect 1
 			writeH(0x00); // Enchant effect 2
 			writeH(0x00); // Enchant effect 3 
 		}
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListBuy.java

@@ -30,15 +30,15 @@ public class PrivateStoreManageListBuy extends L2GameServerPacket
 	private long _playerAdena;
 	private L2ItemInstance[] _itemList;
 	private TradeList.TradeItem[] _buyList;
-
+	
 	public PrivateStoreManageListBuy(L2PcInstance player)
 	{
 		_objId = player.getObjectId();
 		_playerAdena = player.getAdena();
-		_itemList = player.getInventory().getUniqueItems(false,true);
+		_itemList = player.getInventory().getUniqueItems(false, true);
 		_buyList = player.getBuyList().getItems();
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
@@ -46,12 +46,12 @@ public class PrivateStoreManageListBuy extends L2GameServerPacket
 		//section 1
 		writeD(_objId);
 		writeQ(_playerAdena);
-
+		
 		//section2
 		writeD(_itemList.length); // inventory items for potential buy
 		for (L2ItemInstance item : _itemList)
 		{
-
+			
 			writeD(item.getItemId());
 			writeH(0); //show enchant lvl as 0, as you can't buy enchanted weapons
 			writeQ(item.getCount());
@@ -59,18 +59,18 @@ public class PrivateStoreManageListBuy extends L2GameServerPacket
 			writeH(0x00);
 			writeD(item.getItem().getBodyPart());
 			writeH(item.getItem().getType2());
-
+			
 			// T1
 			writeH(item.getAttackElementType());
 			writeH(item.getAttackElementPower());
 			for (byte i = 0; i < 6; i++)
 				writeH(item.getElementDefAttr(i));
-
+			
 			writeH(0x00); // Enchant effect 1
 			writeH(0x00); // Enchant effect 2
 			writeH(0x00); // Enchant effect 3 
 		}
-
+		
 		//section 3
 		writeD(_buyList.length); //count for all items already added for buy
 		for (TradeList.TradeItem item : _buyList)
@@ -90,13 +90,13 @@ public class PrivateStoreManageListBuy extends L2GameServerPacket
 			writeH(item.getAttackElementPower());
 			for (byte i = 0; i < 6; i++)
 				writeH(item.getElementDefAttr(i));
-
+			
 			writeH(0x00); // Enchant effect 1
 			writeH(0x00); // Enchant effect 2
 			writeH(0x00); // Enchant effect 3 
 		}
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListSell.java

@@ -17,7 +17,6 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.TradeList;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * 3 section to this packet
  * 1)playerinfo which is always sent
@@ -39,7 +38,7 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
 	private boolean _packageSale;
 	private TradeList.TradeItem[] _itemList;
 	private TradeList.TradeItem[] _sellList;
-
+	
 	public PrivateStoreManageListSell(L2PcInstance player, boolean isPackageSale)
 	{
 		_objId = player.getObjectId();
@@ -49,7 +48,7 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
 		_itemList = player.getInventory().getAvailableItems(player.getSellList());
 		_sellList = player.getSellList().getItems();
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
@@ -58,7 +57,7 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
 		writeD(_objId);
 		writeD(_packageSale ? 1 : 0); // Package sell
 		writeQ(_playerAdena);
-
+		
 		//section2
 		writeD(_itemList.length); //for potential sells
 		for (TradeList.TradeItem item : _itemList)
@@ -78,7 +77,7 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
 			writeH(item.getAttackElementPower());
 			for (byte i = 0; i < 6; i++)
 				writeH(item.getElementDefAttr(i));
-
+			
 			writeH(0x00); // Enchant effect 1
 			writeH(0x00); // Enchant effect 2
 			writeH(0x00); // Enchant effect 3 
@@ -103,13 +102,13 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
 			writeH(item.getAttackElementPower());
 			for (byte i = 0; i < 6; i++)
 				writeH(item.getElementDefAttr(i));
-
+			
 			writeH(0x00); // Enchant effect 1
 			writeH(0x00); // Enchant effect 2
 			writeH(0x00); // Enchant effect 3 
 		}
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreMsgBuy.java

@@ -26,14 +26,14 @@ public class PrivateStoreMsgBuy extends L2GameServerPacket
 	private static final String _S__D2_PRIVATESTOREMSGBUY = "[S] bf PrivateStoreMsgBuy";
 	private int _objId;
 	private String _storeMsg;
-
+	
 	public PrivateStoreMsgBuy(L2PcInstance player)
 	{
 		_objId = player.getObjectId();
-		if (player.getBuyList() != null) 
+		if (player.getBuyList() != null)
 			_storeMsg = player.getBuyList().getTitle();
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
@@ -41,7 +41,7 @@ public class PrivateStoreMsgBuy extends L2GameServerPacket
 		writeD(_objId);
 		writeS(_storeMsg);
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */
@@ -50,5 +50,5 @@ public class PrivateStoreMsgBuy extends L2GameServerPacket
 	{
 		return _S__D2_PRIVATESTOREMSGBUY;
 	}
-
+	
 }

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreMsgSell.java

@@ -26,14 +26,14 @@ public class PrivateStoreMsgSell extends L2GameServerPacket
 	private static final String _S__B5_PRIVATESTOREMSGSELL = "[S] a2 PrivateStoreMsgSell";
 	private int _objId;
 	private String _storeMsg;
-
+	
 	public PrivateStoreMsgSell(L2PcInstance player)
 	{
 		_objId = player.getObjectId();
-		if (player.getSellList() != null) 
+		if (player.getSellList() != null)
 			_storeMsg = player.getSellList().getTitle();
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
@@ -41,7 +41,7 @@ public class PrivateStoreMsgSell extends L2GameServerPacket
 		writeD(_objId);
 		writeS(_storeMsg);
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/SendTradeRequest.java

@@ -23,19 +23,19 @@ public class SendTradeRequest extends L2GameServerPacket
 {
 	private static final String _S__73_SENDTRADEREQUEST = "[S] 70 SendTradeRequest";
 	private int _senderID;
-
+	
 	public SendTradeRequest(int senderID)
 	{
 		_senderID = senderID;
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0x70);
 		writeD(_senderID);
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/TradeDone.java

@@ -23,19 +23,19 @@ public class TradeDone extends L2GameServerPacket
 {
 	private static final String _S__32_SENDTRADEDONE = "[S] 1c SendTradeDone";
 	private int _num;
-
-	public TradeDone (int num)
+	
+	public TradeDone(int num)
 	{
 		_num = num;
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0x1c);
 		writeD(_num);
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */
@@ -44,5 +44,5 @@ public class TradeDone extends L2GameServerPacket
 	{
 		return _S__32_SENDTRADEDONE;
 	}
-
+	
 }

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/TradeOtherAdd.java

@@ -26,28 +26,28 @@ public final class TradeOtherAdd extends L2GameServerPacket
 {
 	private static final String _S__31_TRADEOTHERADD = "[S] 1b TradeOtherAdd";
 	private TradeList.TradeItem _item;
-
+	
 	public TradeOtherAdd(TradeList.TradeItem item)
 	{
 		_item = item;
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0x1b);
-
-		writeH(1);  // item count
-
+		
+		writeH(1); // item count
+		
 		writeH(_item.getItem().getType1()); // item type1
 		writeD(_item.getObjectId());
 		writeD(_item.getItem().getItemId());
 		writeQ(_item.getCount());
-		writeH(_item.getItem().getType2());	// item type2
-		writeH(0x00);	// ?
-
-		writeD(_item.getItem().getBodyPart());	// rev 415  slot    0006-lr.ear  0008-neck  0030-lr.finger  0040-head  0080-??  0100-l.hand  0200-gloves  0400-chest  0800-pants  1000-feet  2000-??  4000-r.hand  8000-r.hand
-		writeH(_item.getEnchant());	// enchant level
+		writeH(_item.getItem().getType2()); // item type2
+		writeH(0x00); // ?
+		
+		writeD(_item.getItem().getBodyPart()); // rev 415  slot    0006-lr.ear  0008-neck  0030-lr.finger  0040-head  0080-??  0100-l.hand  0200-gloves  0400-chest  0800-pants  1000-feet  2000-??  4000-r.hand  8000-r.hand
+		writeH(_item.getEnchant()); // enchant level
 		writeH(0x00);
 		writeH(_item.getCustomType2());
 		
@@ -56,12 +56,12 @@ public final class TradeOtherAdd extends L2GameServerPacket
 		writeH(_item.getAttackElementPower());
 		for (byte i = 0; i < 6; i++)
 			writeH(_item.getElementDefAttr(i));
-
+		
 		writeH(0x00); // Enchant effect 1
 		writeH(0x00); // Enchant effect 2
 		writeH(0x00); // Enchant effect 3 
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */
@@ -71,5 +71,3 @@ public final class TradeOtherAdd extends L2GameServerPacket
 		return _S__31_TRADEOTHERADD;
 	}
 }
-
-

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/TradeOtherDone.java

@@ -17,18 +17,18 @@ package com.l2jserver.gameserver.network.serverpackets;
 public class TradeOtherDone extends L2GameServerPacket
 {
 	private static final String _S__82_SENDTRADEOTHERDONE = "[S] 82 SendTradeOtherDone";
-
+	
 	public TradeOtherDone()
 	{
 		// trigger packet
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0x82);
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/TradeOwnAdd.java

@@ -26,28 +26,28 @@ public final class TradeOwnAdd extends L2GameServerPacket
 {
 	private static final String _S__30_TRADEOWNADD = "[S] 1a TradeOwnAdd";
 	private TradeList.TradeItem _item;
-
+	
 	public TradeOwnAdd(TradeList.TradeItem item)
 	{
 		_item = item;
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0x1a);
-
-		writeH(1);  // itens added count
-
+		
+		writeH(1); // items added count
+		
 		writeH(_item.getItem().getType1()); // item type1
 		writeD(_item.getObjectId());
 		writeD(_item.getItem().getItemId());
 		writeQ(_item.getCount());
-		writeH(_item.getItem().getType2());	// item type2
-		writeH(0x00);	// ?
-
-		writeD(_item.getItem().getBodyPart());	// rev 415  slot    0006-lr.ear  0008-neck  0030-lr.finger  0040-head  0080-??  0100-l.hand  0200-gloves  0400-chest  0800-pants  1000-feet  2000-??  4000-r.hand  8000-r.hand
-		writeH(_item.getEnchant());	// enchant level
+		writeH(_item.getItem().getType2()); // item type2
+		writeH(0x00); // ?
+		
+		writeD(_item.getItem().getBodyPart()); // rev 415  slot    0006-lr.ear  0008-neck  0030-lr.finger  0040-head  0080-??  0100-l.hand  0200-gloves  0400-chest  0800-pants  1000-feet  2000-??  4000-r.hand  8000-r.hand
+		writeH(_item.getEnchant()); // enchant level
 		writeH(0x00);
 		writeH(_item.getCustomType2());
 		
@@ -56,12 +56,12 @@ public final class TradeOwnAdd extends L2GameServerPacket
 		writeH(_item.getAttackElementPower());
 		for (byte i = 0; i < 6; i++)
 			writeH(_item.getElementDefAttr(i));
-
+		
 		writeH(0x00); // Enchant effect 1
 		writeH(0x00); // Enchant effect 2
 		writeH(0x00); // Enchant effect 3 
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */
@@ -70,5 +70,5 @@ public final class TradeOwnAdd extends L2GameServerPacket
 	{
 		return _S__30_TRADEOWNADD;
 	}
-
+	
 }

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/TradeStart.java

@@ -28,23 +28,23 @@ public final class TradeStart extends L2GameServerPacket
 	private static final String _S__2E_TRADESTART = "[S] 14 TradeStart";
 	private L2PcInstance _activeChar;
 	private L2ItemInstance[] _itemList;
-
-	public TradeStart (L2PcInstance player)
+	
+	public TradeStart(L2PcInstance player)
 	{
 		_activeChar = player;
-        _itemList = _activeChar.getInventory().getAvailableItems(true, (_activeChar.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS));
+		_itemList = _activeChar.getInventory().getAvailableItems(true, (_activeChar.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS));
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{//0x2e TradeStart   d h (h dddhh dhhh)
 		if (_activeChar.getActiveTradeList() == null || _activeChar.getActiveTradeList().getPartner() == null)
 			return;
-
+		
 		writeC(0x14);
 		writeD(_activeChar.getActiveTradeList().getPartner().getObjectId());
 		//writeD((_activeChar != null || _activeChar.getTransactionRequester() != null)? _activeChar.getTransactionRequester().getObjectId() : 0);
-
+		
 		writeH(_itemList.length);
 		for (L2ItemInstance item : _itemList)
 		{
@@ -52,11 +52,11 @@ public final class TradeStart extends L2GameServerPacket
 			writeD(item.getObjectId());
 			writeD(item.getItemId());
 			writeQ(item.getCount());
-			writeH(item.getItem().getType2());	// item type2
-			writeH(0x00);	// ?
-
-			writeD(item.getItem().getBodyPart());	// rev 415  slot    0006-lr.ear  0008-neck  0030-lr.finger  0040-head  0080-??  0100-l.hand  0200-gloves  0400-chest  0800-pants  1000-feet  2000-??  4000-r.hand  8000-r.hand
-			writeH(item.getEnchantLevel());	// enchant level
+			writeH(item.getItem().getType2()); // item type2
+			writeH(0x00); // ?
+			
+			writeD(item.getItem().getBodyPart()); // rev 415  slot    0006-lr.ear  0008-neck  0030-lr.finger  0040-head  0080-??  0100-l.hand  0200-gloves  0400-chest  0800-pants  1000-feet  2000-??  4000-r.hand  8000-r.hand
+			writeH(item.getEnchantLevel()); // enchant level
 			writeH(0x00);
 			writeH(item.getCustomType2());
 			
@@ -65,13 +65,13 @@ public final class TradeStart extends L2GameServerPacket
 			writeH(item.getAttackElementPower());
 			for (byte i = 0; i < 6; i++)
 				writeH(item.getElementDefAttr(i));
-
+			
 			writeH(0x00); // Enchant effect 1
 			writeH(0x00); // Enchant effect 2
 			writeH(0x00); // Enchant effect 3 
 		}
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
 	 */