lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor naming changes for RequestHennaEquip.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-09-09 11:20:21 +00:00
parent 5bb1d54a9a
commit 3235119212
7 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@@ -57,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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)) 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); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET); client.sendPacket(ActionFailed.STATIC_PACKET);
@@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) 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.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());

10
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@@ -57,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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)) 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); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET); client.sendPacket(ActionFailed.STATIC_PACKET);
@@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) 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.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@@ -57,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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)) 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); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET); client.sendPacket(ActionFailed.STATIC_PACKET);
@@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) 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.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());

10
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@@ -57,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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)) 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); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET); client.sendPacket(ActionFailed.STATIC_PACKET);
@@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) 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.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());

10
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@@ -57,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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)) 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); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET); client.sendPacket(ActionFailed.STATIC_PACKET);
@@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) 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.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());

10
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@@ -57,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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)) 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); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET); client.sendPacket(ActionFailed.STATIC_PACKET);
@@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) 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.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());

10
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@@ -57,12 +57,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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)) 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); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET); client.sendPacket(ActionFailed.STATIC_PACKET);
@@ -77,8 +77,8 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) 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.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());