From b047e2efbb0c5ced9b8f8e7778a02459c26d561c Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 21 Nov 2017 22:58:18 +0000 Subject: [PATCH] Fix for black enchant route at max enchant level. --- .../gameserver/network/serverpackets/ExEnchantSkillInfo.java | 2 +- .../gameserver/network/serverpackets/ExEnchantSkillInfo.java | 2 +- .../gameserver/network/serverpackets/ExEnchantSkillInfo.java | 2 +- .../gameserver/network/serverpackets/ExEnchantSkillInfo.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 392aad3470..9ca6f8e0bf 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -56,7 +56,7 @@ public final class ExEnchantSkillInfo implements IClientOutgoingPacket final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); - packet.writeH(currentRouteId != routeId ? subLevel : subLevel + 1); + packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); }); return true; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 392aad3470..9ca6f8e0bf 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -56,7 +56,7 @@ public final class ExEnchantSkillInfo implements IClientOutgoingPacket final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); - packet.writeH(currentRouteId != routeId ? subLevel : subLevel + 1); + packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); }); return true; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 392aad3470..9ca6f8e0bf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -56,7 +56,7 @@ public final class ExEnchantSkillInfo implements IClientOutgoingPacket final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); - packet.writeH(currentRouteId != routeId ? subLevel : subLevel + 1); + packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); }); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 392aad3470..9ca6f8e0bf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -56,7 +56,7 @@ public final class ExEnchantSkillInfo implements IClientOutgoingPacket final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); - packet.writeH(currentRouteId != routeId ? subLevel : subLevel + 1); + packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); }); return true; }