From 32351192120c295d5607c31590b311232d9d409c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 9 Sep 2019 11:20:21 +0000 Subject: [PATCH] Minor naming changes for RequestHennaEquip. --- .../network/clientpackets/RequestHennaEquip.java | 10 +++++----- .../network/clientpackets/RequestHennaEquip.java | 10 +++++----- .../network/clientpackets/RequestHennaEquip.java | 10 +++++----- .../network/clientpackets/RequestHennaEquip.java | 10 +++++----- .../network/clientpackets/RequestHennaEquip.java | 10 +++++----- .../network/clientpackets/RequestHennaEquip.java | 10 +++++----- .../network/clientpackets/RequestHennaEquip.java | 10 +++++----- 7 files changed, 35 insertions(+), 35 deletions(-) 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 32bad410e0..069d88a3c2 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,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalHennaSlots = player.getHennaEmptySlots(); + 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)) { - totalHennaSlots++; + totalEmptySlots++; } - if (totalHennaSlots == 0) + if (totalEmptySlots == 0) { player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); client.sendPacket(ActionFailed.STATIC_PACKET); @@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket 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)) + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); + if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); 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 32bad410e0..069d88a3c2 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,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalHennaSlots = player.getHennaEmptySlots(); + 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)) { - totalHennaSlots++; + totalEmptySlots++; } - if (totalHennaSlots == 0) + if (totalEmptySlots == 0) { player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); client.sendPacket(ActionFailed.STATIC_PACKET); @@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket 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)) + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); + if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); 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 32bad410e0..069d88a3c2 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,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalHennaSlots = player.getHennaEmptySlots(); + 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)) { - totalHennaSlots++; + totalEmptySlots++; } - if (totalHennaSlots == 0) + if (totalEmptySlots == 0) { player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); client.sendPacket(ActionFailed.STATIC_PACKET); @@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket 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)) + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); + if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); 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 32bad410e0..069d88a3c2 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,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalHennaSlots = player.getHennaEmptySlots(); + 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)) { - totalHennaSlots++; + totalEmptySlots++; } - if (totalHennaSlots == 0) + if (totalEmptySlots == 0) { player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); client.sendPacket(ActionFailed.STATIC_PACKET); @@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket 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)) + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); + if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); 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 32bad410e0..069d88a3c2 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,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalHennaSlots = player.getHennaEmptySlots(); + 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)) { - totalHennaSlots++; + totalEmptySlots++; } - if (totalHennaSlots == 0) + if (totalEmptySlots == 0) { player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); client.sendPacket(ActionFailed.STATIC_PACKET); @@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket 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)) + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); + if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); 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 32bad410e0..069d88a3c2 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,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalHennaSlots = player.getHennaEmptySlots(); + 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)) { - totalHennaSlots++; + totalEmptySlots++; } - if (totalHennaSlots == 0) + if (totalEmptySlots == 0) { player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); client.sendPacket(ActionFailed.STATIC_PACKET); @@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket 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)) + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); + if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); 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 32bad410e0..069d88a3c2 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,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket return; } - int totalHennaSlots = player.getHennaEmptySlots(); + 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)) { - totalHennaSlots++; + totalEmptySlots++; } - if (totalHennaSlots == 0) + if (totalEmptySlots == 0) { player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); client.sendPacket(ActionFailed.STATIC_PACKET); @@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket 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)) + final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); + if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) { player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());