瀏覽代碼

BETA: Minor revert for hennas, from [5503-5505].
* Added class JavaDocs.

Reported By:
- franpisco
- Konstantinos
- u3games

Zoey76 13 年之前
父節點
當前提交
68dcfede99

+ 16 - 7
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java

@@ -14,19 +14,31 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.L2Henna;
 
 /**
+ * This server packet sends the player's henna information using the Game Master's UI.
  * @author KenM, Zoey76
  */
 public final class GMHennaInfo extends L2GameServerPacket
 {
 	private final L2PcInstance _activeChar;
+	private final List<L2Henna> _hennas = new ArrayList<>();
 	
 	public GMHennaInfo(L2PcInstance player)
 	{
 		_activeChar = player;
+		for (L2Henna henna : _activeChar.getHennaList())
+		{
+			if (henna != null)
+			{
+				_hennas.add(henna);
+			}
+		}
 	}
 	
 	@Override
@@ -40,14 +52,11 @@ public final class GMHennaInfo extends L2GameServerPacket
 		writeC(_activeChar.getHennaStatDEX()); // equip DEX
 		writeC(_activeChar.getHennaStatWIT()); // equip WIT
 		writeD(3); // Slots
-		writeD(3 - _activeChar.getHennaEmptySlots());
-		for (L2Henna henna : _activeChar.getHennaList())
+		writeD(_hennas.size()); // Size
+		for (L2Henna henna : _hennas)
 		{
-			if (henna != null)
-			{
-				writeD(henna.getDyeId());
-				writeD(0x01);
-			}
+			writeD(henna.getDyeId());
+			writeD(0x01);
 		}
 	}
 }

+ 17 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java

@@ -14,19 +14,31 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.L2Henna;
 
 /**
+ * This server packet sends the player's henna information.
  * @author Zoey76
  */
 public final class HennaInfo extends L2GameServerPacket
 {
 	private final L2PcInstance _activeChar;
+	private final List<L2Henna> _hennas = new ArrayList<>();
 	
 	public HennaInfo(L2PcInstance player)
 	{
 		_activeChar = player;
+		for (L2Henna henna : _activeChar.getHennaList())
+		{
+			if (henna != null)
+			{
+				_hennas.add(henna);
+			}
+		}
 	}
 	
 	@Override
@@ -39,15 +51,12 @@ public final class HennaInfo extends L2GameServerPacket
 		writeC(_activeChar.getHennaStatMEN()); // equip MEN
 		writeC(_activeChar.getHennaStatDEX()); // equip DEX
 		writeC(_activeChar.getHennaStatWIT()); // equip WIT
-		writeD(3); // Slots
-		writeD(3 - _activeChar.getHennaEmptySlots());
-		for (L2Henna henna : _activeChar.getHennaList())
+		writeD(3); // Slots 
+		writeD(_hennas.size()); // Size
+		for (L2Henna henna : _hennas)
 		{
-			if (henna != null)
-			{
-				writeD(henna.getDyeId());
-				writeD(0x01);
-			}
+			writeD(henna.getDyeId());
+			writeD(0x01);
 		}
 	}
 }