Forráskód Böngészése

BETA: Fixing wrong format in AbstractItemPacket for quest items.

Reported by: Tavo22, lucan
Reviewed by: UnAfraid
Nos 11 éve
szülő
commit
485ff48c56

+ 4 - 22
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.java

@@ -30,30 +30,15 @@ public abstract class AbstractItemPacket extends L2GameServerPacket
 {
 	protected void writeItem(TradeItem item)
 	{
-		writeItem(new ItemInfo(item), false);
-	}
-	
-	protected void writeItem(ItemInfo item)
-	{
-		writeItem(item, false);
-	}
-	
-	protected void writeItem(TradeItem item, boolean questItem)
-	{
-		writeItem(new ItemInfo(item), questItem);
+		writeItem(new ItemInfo(item));
 	}
 	
 	protected void writeItem(L2ItemInstance item)
 	{
-		writeItem(new ItemInfo(item), false);
+		writeItem(new ItemInfo(item));
 	}
 	
-	protected void writeItem(L2ItemInstance item, boolean questItem)
-	{
-		writeItem(new ItemInfo(item), questItem);
-	}
-	
-	protected void writeItem(ItemInfo item, boolean questItem)
+	protected void writeItem(ItemInfo item)
 	{
 		writeD(item.getObjectId()); // ObjectId
 		writeD(item.getItem().getDisplayId()); // ItemId
@@ -61,10 +46,7 @@ public abstract class AbstractItemPacket extends L2GameServerPacket
 		writeQ(item.getCount()); // Quantity
 		writeH(item.getItem().getType2()); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
 		writeH(item.getCustomType1()); // Filler (always 0)
-		if (!questItem)
-		{
-			writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
-		}
+		writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		writeD(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
 		writeH(item.getEnchant()); // Enchant level (pet level shown in control item)
 		writeH(item.getCustomType2()); // Pet name exists or not shown in control item

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java

@@ -65,13 +65,13 @@ public final class ExItemAuctionInfoPacket extends AbstractItemPacket
 		writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid());
 		
 		writeD(_timeRemaining);
-		writeItem(_currentAuction.getItemInfo(), false);
+		writeItem(_currentAuction.getItemInfo());
 		
 		if (_nextAuction != null)
 		{
 			writeQ(_nextAuction.getAuctionInitBid());
 			writeD((int) (_nextAuction.getStartingTime() / 1000)); // unix time in seconds
-			writeItem(_nextAuction.getItemInfo(), false);
+			writeItem(_nextAuction.getItemInfo());
 		}
 	}
 }

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExQuestItemList.java

@@ -52,7 +52,7 @@ public class ExQuestItemList extends AbstractItemPacket
 		writeH(_items.size());
 		for (L2ItemInstance item : _items)
 		{
-			writeItem(item, true);
+			writeItem(item);
 		}
 		writeInventoryBlock(_activeChar.getInventory());
 	}