From ee96d3d248ec7c4ce2e5384f38ad45ef7283d8dc Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 19 Oct 2019 12:05:11 +0000
Subject: [PATCH] CharSelection improvements for Classic Interlude.

---
 .../gameserver/model/CharSelectInfoPackage.java    |  5 ++---
 .../network/serverpackets/CharSelectionInfo.java   | 14 +++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
index 0b2e0edced..213ee74ba5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.model;
 
-import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.variables.PlayerVariables;
 
@@ -321,9 +320,9 @@ public class CharSelectInfoPackage
 		_sp = sp;
 	}
 	
-	public int getEnchantEffect()
+	public int getEnchantEffect(int slot)
 	{
-		return _paperdoll[Inventory.PAPERDOLL_RHAND][2];
+		return _paperdoll[slot][2];
 	}
 	
 	public void setReputation(int reputation)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
index c021f92097..bc5251bbae 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
@@ -176,11 +176,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket
 				packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot));
 			}
 			
-			packet.writeH(0x00); // Upper Body enchant level
-			packet.writeH(0x00); // Lower Body enchant level
-			packet.writeH(0x00); // Headgear enchant level
-			packet.writeH(0x00); // Gloves enchant level
-			packet.writeH(0x00); // Boots enchant level
+			packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level
+			packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level
+			packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level
+			packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level
+			packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level
 			
 			packet.writeD(charInfoPackage.getHairStyle());
 			packet.writeD(charInfoPackage.getHairColor());
@@ -193,7 +193,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket
 			packet.writeD(charInfoPackage.getClassId());
 			packet.writeD(i == _activeId ? 1 : 0);
 			
-			packet.writeC(charInfoPackage.getEnchantEffect() > 127 ? 127 : charInfoPackage.getEnchantEffect());
+			packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND));
 			packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0);
 			packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0);
 			
@@ -212,7 +212,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket
 			packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses
 			packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not
 			packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00);
-			packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow
+			packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow
 			packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled
 		}
 		return true;