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

Separate premium henna slot availability check.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-09-10 11:44:20 +00:00
parent e32a96a306
commit 14253af191
7 changed files with 168 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null) if (henna == null)
{ {
@@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); 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))
{ {

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

@@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null) if (henna == null)
{ {
@@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); 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))
{ {

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

@@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null) if (henna == null)
{ {
@@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); 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))
{ {

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

@@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null) if (henna == null)
{ {
@@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); 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))
{ {

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

@@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null) if (henna == null)
{ {
@@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); 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))
{ {

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

@@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null) if (henna == null)
{ {
@@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); 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))
{ {

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

@@ -57,18 +57,6 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null) if (henna == null)
{ {
@@ -77,6 +65,30 @@ public class RequestHennaEquip implements IClientIncomingPacket
return; 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); 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))
{ {