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

Refine system adjustments for Adena fee.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-03-05 14:39:22 +00:00
parent 61fb072ccb
commit f1e4dbd7c2
12 changed files with 90 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
View File

@ -54,30 +54,19 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
return false;
}
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
if (feeItem != null)
{
return false;
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
{
return false;
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
// TODO: Update XMLs.
// Check for item id
// if (fee.getItemId() != feeItem.getId())
// {
// return false;
// }
// TODO: Update XMLs.
// Count must be greater or equal of required number
// if (fee.getItemCount() > feeItem.getCount())
// {
// return false;
// }
return true;
}
@ -101,6 +90,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Lifestone must be located in inventory
if (mineralItem.getItemLocation() != ItemLocation.INVENTORY)
{
@ -128,11 +118,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Remove the augmentation if any (286).
// if (item.isAugmented())
// {
// return false;
// }
if (item.isHeroItem())
{
return false;

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
View File

@ -76,7 +76,7 @@ public class RequestRefine extends AbstractRefinePacket
}
final Item feeItem = player.getInventory().getItemByItemId(fee.getItemId());
if (feeItem == null)
if ((feeItem == null) && (fee.getItemId() != 0))
{
return;
}
@ -156,7 +156,7 @@ public class RequestRefine extends AbstractRefinePacket
}
// Consume the gemstones.
if (!player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
if ((feeItem != null) && !player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
{
return;
}

40
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
View File

@ -54,30 +54,19 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
return false;
}
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
if (feeItem != null)
{
return false;
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
{
return false;
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
// TODO: Update XMLs.
// Check for item id
// if (fee.getItemId() != feeItem.getId())
// {
// return false;
// }
// TODO: Update XMLs.
// Count must be greater or equal of required number
// if (fee.getItemCount() > feeItem.getCount())
// {
// return false;
// }
return true;
}
@ -101,6 +90,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Lifestone must be located in inventory
if (mineralItem.getItemLocation() != ItemLocation.INVENTORY)
{
@ -128,11 +118,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Remove the augmentation if any (286).
// if (item.isAugmented())
// {
// return false;
// }
if (item.isHeroItem())
{
return false;

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
View File

@ -76,7 +76,7 @@ public class RequestRefine extends AbstractRefinePacket
}
final Item feeItem = player.getInventory().getItemByItemId(fee.getItemId());
if (feeItem == null)
if ((feeItem == null) && (fee.getItemId() != 0))
{
return;
}
@ -156,7 +156,7 @@ public class RequestRefine extends AbstractRefinePacket
}
// Consume the gemstones.
if (!player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
if ((feeItem != null) && !player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
{
return;
}

40
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
View File

@ -54,30 +54,19 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
return false;
}
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
if (feeItem != null)
{
return false;
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
{
return false;
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
// TODO: Update XMLs.
// Check for item id
// if (fee.getItemId() != feeItem.getId())
// {
// return false;
// }
// TODO: Update XMLs.
// Count must be greater or equal of required number
// if (fee.getItemCount() > feeItem.getCount())
// {
// return false;
// }
return true;
}
@ -101,6 +90,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Lifestone must be located in inventory
if (mineralItem.getItemLocation() != ItemLocation.INVENTORY)
{
@ -128,11 +118,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Remove the augmentation if any (286).
// if (item.isAugmented())
// {
// return false;
// }
if (item.isHeroItem())
{
return false;

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
View File

@ -76,7 +76,7 @@ public class RequestRefine extends AbstractRefinePacket
}
final Item feeItem = player.getInventory().getItemByItemId(fee.getItemId());
if (feeItem == null)
if ((feeItem == null) && (fee.getItemId() != 0))
{
return;
}
@ -156,7 +156,7 @@ public class RequestRefine extends AbstractRefinePacket
}
// Consume the gemstones.
if (!player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
if ((feeItem != null) && !player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
{
return;
}

40
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
View File

@ -54,30 +54,19 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
return false;
}
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
if (feeItem != null)
{
return false;
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
{
return false;
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
// TODO: Update XMLs.
// Check for item id
// if (fee.getItemId() != feeItem.getId())
// {
// return false;
// }
// TODO: Update XMLs.
// Count must be greater or equal of required number
// if (fee.getItemCount() > feeItem.getCount())
// {
// return false;
// }
return true;
}
@ -101,6 +90,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Lifestone must be located in inventory
if (mineralItem.getItemLocation() != ItemLocation.INVENTORY)
{
@ -128,11 +118,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Remove the augmentation if any (286).
// if (item.isAugmented())
// {
// return false;
// }
if (item.isHeroItem())
{
return false;

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
View File

@ -76,7 +76,7 @@ public class RequestRefine extends AbstractRefinePacket
}
final Item feeItem = player.getInventory().getItemByItemId(fee.getItemId());
if (feeItem == null)
if ((feeItem == null) && (fee.getItemId() != 0))
{
return;
}
@ -156,7 +156,7 @@ public class RequestRefine extends AbstractRefinePacket
}
// Consume the gemstones.
if (!player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
if ((feeItem != null) && !player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
{
return;
}

40
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
View File

@ -54,30 +54,19 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
return false;
}
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
if (feeItem != null)
{
return false;
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
{
return false;
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
// TODO: Update XMLs.
// Check for item id
// if (fee.getItemId() != feeItem.getId())
// {
// return false;
// }
// TODO: Update XMLs.
// Count must be greater or equal of required number
// if (fee.getItemCount() > feeItem.getCount())
// {
// return false;
// }
return true;
}
@ -101,6 +90,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Lifestone must be located in inventory
if (mineralItem.getItemLocation() != ItemLocation.INVENTORY)
{
@ -128,11 +118,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Remove the augmentation if any (286).
// if (item.isAugmented())
// {
// return false;
// }
if (item.isHeroItem())
{
return false;

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
View File

@ -76,7 +76,7 @@ public class RequestRefine extends AbstractRefinePacket
}
final Item feeItem = player.getInventory().getItemByItemId(fee.getItemId());
if (feeItem == null)
if ((feeItem == null) && (fee.getItemId() != 0))
{
return;
}
@ -156,7 +156,7 @@ public class RequestRefine extends AbstractRefinePacket
}
// Consume the gemstones.
if (!player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
if ((feeItem != null) && !player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
{
return;
}

40
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
View File

@ -54,30 +54,19 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
return false;
}
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
if (feeItem != null)
{
return false;
// GemStones must belong to owner
if (feeItem.getOwnerId() != player.getObjectId())
{
return false;
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
}
// .. and located in inventory
if (feeItem.getItemLocation() != ItemLocation.INVENTORY)
{
return false;
}
// TODO: Update XMLs.
// Check for item id
// if (fee.getItemId() != feeItem.getId())
// {
// return false;
// }
// TODO: Update XMLs.
// Count must be greater or equal of required number
// if (fee.getItemCount() > feeItem.getCount())
// {
// return false;
// }
return true;
}
@ -101,6 +90,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Lifestone must be located in inventory
if (mineralItem.getItemLocation() != ItemLocation.INVENTORY)
{
@ -128,11 +118,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
{
return false;
}
// Remove the augmentation if any (286).
// if (item.isAugmented())
// {
// return false;
// }
if (item.isHeroItem())
{
return false;

4
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
View File

@ -76,7 +76,7 @@ public class RequestRefine extends AbstractRefinePacket
}
final Item feeItem = player.getInventory().getItemByItemId(fee.getItemId());
if (feeItem == null)
if ((feeItem == null) && (fee.getItemId() != 0))
{
return;
}
@ -156,7 +156,7 @@ public class RequestRefine extends AbstractRefinePacket
}
// Consume the gemstones.
if (!player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
if ((feeItem != null) && !player.destroyItem("RequestRefine", feeItem, _feeCount, null, false))
{
return;
}