diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 069d88a3c2..c3800575d8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalEmptySlots = player.getHennaEmptySlots(); - if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1) && (player.getHenna(4) == null)) - { - totalEmptySlots++; - } - if (totalEmptySlots == 0) - { - player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); - client.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { @@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } + if (henna.isPremium()) + { + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1)) + { + if (player.getHenna(4) != null) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else + { + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else if (player.getHennaEmptySlots() == 0) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 069d88a3c2..c3800575d8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalEmptySlots = player.getHennaEmptySlots(); - if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1) && (player.getHenna(4) == null)) - { - totalEmptySlots++; - } - if (totalEmptySlots == 0) - { - player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); - client.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { @@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } + if (henna.isPremium()) + { + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1)) + { + if (player.getHenna(4) != null) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else + { + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else if (player.getHennaEmptySlots() == 0) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 069d88a3c2..c3800575d8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalEmptySlots = player.getHennaEmptySlots(); - if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1) && (player.getHenna(4) == null)) - { - totalEmptySlots++; - } - if (totalEmptySlots == 0) - { - player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); - client.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { @@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } + if (henna.isPremium()) + { + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1)) + { + if (player.getHenna(4) != null) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else + { + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else if (player.getHennaEmptySlots() == 0) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 069d88a3c2..c3800575d8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalEmptySlots = player.getHennaEmptySlots(); - if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1) && (player.getHenna(4) == null)) - { - totalEmptySlots++; - } - if (totalEmptySlots == 0) - { - player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); - client.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { @@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } + if (henna.isPremium()) + { + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1)) + { + if (player.getHenna(4) != null) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else + { + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else if (player.getHennaEmptySlots() == 0) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 069d88a3c2..c3800575d8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalEmptySlots = player.getHennaEmptySlots(); - if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1) && (player.getHenna(4) == null)) - { - totalEmptySlots++; - } - if (totalEmptySlots == 0) - { - player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); - client.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { @@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } + if (henna.isPremium()) + { + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1)) + { + if (player.getHenna(4) != null) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else + { + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else if (player.getHennaEmptySlots() == 0) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 069d88a3c2..c3800575d8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalEmptySlots = player.getHennaEmptySlots(); - if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1) && (player.getHenna(4) == null)) - { - totalEmptySlots++; - } - if (totalEmptySlots == 0) - { - player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); - client.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { @@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } + if (henna.isPremium()) + { + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1)) + { + if (player.getHenna(4) != null) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else + { + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else if (player.getHennaEmptySlots() == 0) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 069d88a3c2..c3800575d8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalEmptySlots = player.getHennaEmptySlots(); - if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1) && (player.getHenna(4) == null)) - { - totalEmptySlots++; - } - if (totalEmptySlots == 0) - { - player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); - client.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { @@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } + if (henna.isPremium()) + { + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || player.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (player.getClassId().level() > 1)) + { + if (player.getHenna(4) != null) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else + { + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + } + else if (player.getHennaEmptySlots() == 0) + { + player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); + client.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) {