浏览代码

Fixed pet name existence not shown in many dialogs - trade, warehouse, private store.
Two known issues:
1. GM warehouse view
2. Pet inventory view
In both cases client ignore this info.

_DS_ 15 年之前
父节点
当前提交
ea6e338369

+ 10 - 0
L2_GameServer/java/net/sf/l2j/gameserver/model/TradeList.java

@@ -43,6 +43,7 @@ public class TradeList
 		private int _objectId;
 		private final L2Item _item;
 		private int _enchant;
+		private int _type2;
 		private long _count;
 		private long _storeCount;
 		private long _price;
@@ -55,12 +56,14 @@ public class TradeList
 			_objectId = item.getObjectId();
 			_item = item.getItem();
 			_enchant = item.getEnchantLevel();
+			_type2 = item.getCustomType2();
 			_count = count;
 			_price = price;
 			_elemAtkType = item.getAttackElementType();
 			_elemAtkPower = item.getAttackElementPower();
 			for (byte i = 0; i < 6; i++)
 				_elemDefAttr[i] = item.getElementDefAttr(i);
+			System.err.println("item "+_item.getName());
 		}
 
 		public TradeItem(L2Item item, long count, long price)
@@ -68,6 +71,7 @@ public class TradeList
 			_objectId = 0;
 			_item = item;
 			_enchant = 0;
+			_type2 = 0;
 			_count = count;
 			_storeCount = count;
 			_price = price;
@@ -80,6 +84,7 @@ public class TradeList
 			_objectId = item.getObjectId();
 			_item = item.getItem();
 			_enchant = item.getEnchant();
+			_type2 = 0;
 			_count = count;
 			_storeCount = count;
 			_price = price;
@@ -114,6 +119,11 @@ public class TradeList
 			return _enchant;
 		}
 
+		public int getCustomType2()
+		{
+			return _type2;
+		}
+
 		public void setCount(long count)
 		{
 			_count = count;

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/PackageSendableList.java

@@ -65,8 +65,8 @@ public class PackageSendableList extends L2GameServerPacket
 			writeH(item.getCustomType1());
 			writeD(item.getItem().getBodyPart());
 			writeH(item.getEnchantLevel());
-			writeH(item.getCustomType2());
 			writeH(0x00);
+			writeH(item.getCustomType2());
 			writeD(item.getObjectId()); // some item identifier later used by client to answer (see RequestPackageSend) not item id nor object id maybe some freight system id??
 			//T1
 			writeH(item.getAttackElementType());

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/PetInventoryUpdate.java

@@ -85,7 +85,7 @@ public class PetInventoryUpdate extends L2GameServerPacket
 			writeH(item.getEquipped());
 			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());
 
 			writeH(item.getAttackElementType());
 			writeH(item.getAttackElementPower());

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/PrivateStoreListSell.java

@@ -55,7 +55,7 @@ public class PrivateStoreListSell extends L2GameServerPacket
             writeQ(item.getCount());
 			writeH(0x00);
 			writeH(item.getEnchant());
-			writeH(0x00);
+			writeH(item.getCustomType2());
 			writeD(item.getItem().getBodyPart());
 			writeQ(item.getPrice()); //your price
 			writeQ(item.getItem().getReferencePrice()); //store price

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/PrivateStoreManageListSell.java

@@ -69,7 +69,7 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
 			writeQ(item.getCount());
 			writeH(0);
 			writeH(item.getEnchant());//enchant lvl
-			writeH(0);
+			writeH(item.getCustomType2());
 			writeD(item.getItem().getBodyPart());
 			writeQ(item.getPrice()); //store price
 			

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/SellList.java

@@ -91,7 +91,7 @@ public class SellList extends L2GameServerPacket
 			writeD(item.getItem().getBodyPart());
 			writeH(item.getEnchantLevel());
 			writeH(0x00);
-			writeH(0x00);
+			writeH(item.getCustomType2());
 			writeQ(item.getItem().getReferencePrice()/2);
 
 			// T1

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/TradeOtherAdd.java

@@ -48,8 +48,8 @@ public final class TradeOtherAdd extends L2GameServerPacket
 
 		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(0x00);
+		writeH(_item.getCustomType2());
 		
 		// T1
 		writeH(_item.getAttackElementType());

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/TradeOwnAdd.java

@@ -48,8 +48,8 @@ public final class TradeOwnAdd extends L2GameServerPacket
 
 		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(0x00);
+		writeH(_item.getCustomType2());
 		
 		// T1
 		writeH(_item.getAttackElementType());

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/TradeStart.java

@@ -57,8 +57,8 @@ public final class TradeStart extends L2GameServerPacket
 
 			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(0x00);
+			writeH(item.getCustomType2());
 			
 			// T1
 			writeH(item.getAttackElementType());

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/WareHouseDepositList.java

@@ -77,8 +77,8 @@ public final class WareHouseDepositList extends L2GameServerPacket
 			writeH(item.getCustomType1());
 			writeD(item.getItem().getBodyPart());
 			writeH(item.getEnchantLevel());
+			writeH(0x00);
 			writeH(item.getCustomType2());
-			writeH(0x00); // ? 200
 			writeD(item.getObjectId());
 			if (item.isAugmented())
 			{

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/WareHouseWithdrawalList.java

@@ -80,8 +80,8 @@ public final class WareHouseWithdrawalList extends L2GameServerPacket
 			writeH(item.getCustomType1());
 			writeD(item.getItem().getBodyPart());
 			writeH(item.getEnchantLevel());
+			writeH(0x00);
 			writeH(item.getCustomType2());
-			writeH(0x00); // ?
 			writeD(item.getObjectId());
 			if (item.isAugmented())
 			{