fix untrain enchanted skills (gives back SP)

L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java

@@ -27,7 +27,6 @@ import net.sf.l2j.gameserver.model.L2EnchantSkillLearn.EnchantSkillDetail;
 import net.sf.l2j.gameserver.model.actor.L2Npc;
 import net.sf.l2j.gameserver.model.actor.instance.L2NpcInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
-import net.sf.l2j.gameserver.model.base.Experience;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.network.serverpackets.ExBrExtraUserInfo;
 import net.sf.l2j.gameserver.network.serverpackets.ShortCutRegister;
@@ -45,170 +44,130 @@ import net.sf.l2j.gameserver.network.serverpackets.UserInfo;
  */
 public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 {
-    protected static final Logger _log = Logger.getLogger(RequestExEnchantSkillUntrain.class.getName());
+	protected static final Logger _log = Logger.getLogger(RequestExEnchantSkillUntrain.class.getName());
 	private int _skillId;
 	private int _skillLvl;
 	
-	
 	@Override
-    protected void readImpl()
+	protected void readImpl()
 	{
 		_skillId = readD();
 		_skillLvl = readD();
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see net.sf.l2j.gameserver.clientpackets.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()
 	{
-        L2PcInstance player = getClient().getActiveChar();
-        if (player == null)
-            return;
-        
-        L2NpcInstance trainer = player.getLastFolkNPC();
-        if (trainer == null)
-            return;
-        
-        if ((trainer == null || !player.isInsideRadius(trainer, L2Npc.INTERACTION_DISTANCE, false, false)) && !player.isGM())
-            return;
-        
-        if (player.getClassId().level() < 3) // requires to have 3rd class quest completed
-            return;
-        
-        if (player.getLevel() < 76) 
-            return;
-        
-        L2Skill skill = SkillTable.getInstance().getInfo(_skillId, _skillLvl);
-        if (skill == null)
-        {
-            return;
-        }
-        
-/*        if (!skill.canTeachBy(npcid) || !skill.getCanLearn(player.getClassId()))
-        {
-            if (!Config.ALT_GAME_SKILL_LEARN)
-            {
-                player.sendMessage("You are trying to learn skill that u can't..");
-                Util.handleIllegalPlayerAction(player, "Client "+this.getClient()+" tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK);
-                return;
-            }
-        }*/
-        
-	    int reqItemId = SkillTreeTable.UNTRAIN_ENCHANT_BOOK;
-        
-        L2EnchantSkillLearn s = SkillTreeTable.getInstance().getSkillEnchantmentBySkillId(_skillId);
-        if (s == null)
-        {
-            return;
-        }
-        
-        int currentLevel = player.getSkillLevel(_skillId);
-        if (currentLevel - 1 != _skillLvl && (currentLevel%100 != 1 || _skillLvl != s.getBaseLevel()))
-        {
-            return;
-        }
-        
-        EnchantSkillDetail esd = s.getEnchantSkillDetail(currentLevel);
-        
-        
-        int requiredSp = esd.getSpCost();
-        int requiredExp = esd.getExp();
-        //int rate = esd.getRate(player);
-        
-        if (player.getSp() >= requiredSp)
-        {
-            long expAfter = player.getExp() - requiredExp;
-            if (player.getExp() >= requiredExp && expAfter >= Experience.LEVEL[player.getLevel()])
-            {
-                // only first lvl requires book
-                boolean usesBook = _skillLvl == s.getBaseLevel();
-                
-                L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
-                if (Config.ES_SP_BOOK_NEEDED && usesBook) 
-                {
-                    if (spb == null)// Haven't spellbook
-                    {
-                        player.sendPacket(new SystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
-                        return;
-                    }
-                }
-                
-                boolean check;
-                check = player.getStat().removeExpAndSp(requiredExp, requiredSp);
-                if (Config.ES_SP_BOOK_NEEDED && usesBook) 
-                {
-                    check &= player.destroyItem("Consume", spb.getObjectId(), 1, trainer, true);
-                }
-                
-                
-                if (!check)
-                {
-                    player.sendPacket(new SystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
-                    return;
-                }
-                
-                if (_skillLvl%100 == 0)
-                {
-                    _skillLvl = s.getBaseLevel();
-                }
-                
-                player.addSkill(skill, true);
-                
-                if (Config.DEBUG)
-                {
-                    _log.fine("Learned skill ID: "+_skillId+" Level: "+_skillLvl+" for "+requiredSp+" SP, "+requiredExp+" EXP.");
-                }
-
-                player.sendPacket(new UserInfo(player));
-                player.sendPacket(new ExBrExtraUserInfo(player));
-                
-                if (_skillLvl > 100)
-                {
-                    SystemMessage sm = new SystemMessage(SystemMessageId.UNTRAIN_SUCCESSFUL_SKILL_S1_ENCHANT_LEVEL_DECREASED_BY_ONE);
-                    sm.addSkillName(_skillId);
-                    player.sendPacket(sm);
-                }
-                else
-                {
-                    SystemMessage sm = new SystemMessage(SystemMessageId.UNTRAIN_SUCCESSFUL_SKILL_S1_ENCHANT_LEVEL_RESETED);
-                    sm.addSkillName(_skillId);
-                    player.sendPacket(sm);
-                }
-                
-                trainer.showEnchantUntrainSkillList(player, player.getClassId());
-                this.updateSkillShortcuts(player);
-            }
-            else
-            {
-                SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DONT_HAVE_ENOUGH_EXP_TO_ENCHANT_THAT_SKILL);
-                player.sendPacket(sm);
-            }
-        }
-        else
-        {
-            SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DONT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
-            player.sendPacket(sm);
-        }
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null)
+			return;
+		
+		L2NpcInstance trainer = player.getLastFolkNPC();
+		if (trainer == null)
+			return;
+		
+		if ((trainer == null || !player.isInsideRadius(trainer, L2Npc.INTERACTION_DISTANCE, false, false)) && !player.isGM())
+			return;
+		
+		if (player.getClassId().level() < 3) // requires to have 3rd class quest completed
+			return;
+		
+		if (player.getLevel() < 76)
+			return;
+		
+		L2Skill skill = SkillTable.getInstance().getInfo(_skillId, _skillLvl);
+		if (skill == null)
+			return;
+		
+		int reqItemId = SkillTreeTable.UNTRAIN_ENCHANT_BOOK;
+		
+		L2EnchantSkillLearn s = SkillTreeTable.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		if (s == null)
+			return;
+		
+		int currentLevel = player.getSkillLevel(_skillId);
+		if (currentLevel - 1 != _skillLvl && (currentLevel % 100 != 1 || _skillLvl != s.getBaseLevel()))
+			return;
+		
+		EnchantSkillDetail esd = s.getEnchantSkillDetail(currentLevel);
+		
+		int requiredSp = esd.getSpCost();
+		int requiredExp = esd.getExp();
+		
+		L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
+		if (Config.ES_SP_BOOK_NEEDED)
+		{
+			if (spb == null) // Haven't spellbook
+			{
+				player.sendPacket(new SystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
+				return;
+			}
+		}
+		
+		boolean check;
+		check = player.getStat().addExpAndSp(0, (int) (requiredSp * 0.8));
+		if (Config.ES_SP_BOOK_NEEDED)
+		{
+			check &= player.destroyItem("Consume", spb.getObjectId(), 1, trainer, true);
+		}
+		
+		if (!check)
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
+			return;
+		}
+		
+		if (_skillLvl % 100 == 0)
+		{
+			_skillLvl = s.getBaseLevel();
+		}
+		
+		player.addSkill(skill, true);
+		
+		if (Config.DEBUG)
+		{
+			_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requiredExp + " EXP.");
+		}
+		
+		player.sendPacket(new UserInfo(player));
+		player.sendPacket(new ExBrExtraUserInfo(player));
+		
+		if (_skillLvl > 100)
+		{
+			SystemMessage sm = new SystemMessage(SystemMessageId.UNTRAIN_SUCCESSFUL_SKILL_S1_ENCHANT_LEVEL_DECREASED_BY_ONE);
+			sm.addSkillName(_skillId);
+			player.sendPacket(sm);
+		}
+		else
+		{
+			SystemMessage sm = new SystemMessage(SystemMessageId.UNTRAIN_SUCCESSFUL_SKILL_S1_ENCHANT_LEVEL_RESETED);
+			sm.addSkillName(_skillId);
+			player.sendPacket(sm);
+		}
+		
+		trainer.showEnchantUntrainSkillList(player, player.getClassId());
+		this.updateSkillShortcuts(player);
 	}
-    
-    private void updateSkillShortcuts(L2PcInstance player)
-    {
-        // update all the shortcuts to this skill
-        L2ShortCut[] allShortCuts = player.getAllShortCuts();
-        
-        for (L2ShortCut sc : allShortCuts)
-        {
-            if (sc.getId() == _skillId && sc.getType() == L2ShortCut.TYPE_SKILL)
-            {
-                L2ShortCut newsc = new L2ShortCut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), _skillLvl, 1);
-                player.sendPacket(new ShortCutRegister(newsc));
-                player.registerShortCut(newsc);
-            }
-        }
-    }
-
+	
+	private void updateSkillShortcuts(L2PcInstance player)
+	{
+		// update all the shortcuts to this skill
+		L2ShortCut[] allShortCuts = player.getAllShortCuts();
+		
+		for (L2ShortCut sc : allShortCuts)
+		{
+			if (sc.getId() == _skillId && sc.getType() == L2ShortCut.TYPE_SKILL)
+			{
+				L2ShortCut newsc = new L2ShortCut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), _skillLvl, 1);
+				player.sendPacket(new ShortCutRegister(newsc));
+				player.registerShortCut(newsc);
+			}
+		}
+	}
+	
 	/* (non-Javadoc)
 	 * @see net.sf.l2j.gameserver.BasePacket#getType()
 	 */