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

Fixed RequestExTryEnchantArtifact ingredient check.

Browse Source 
Thanks to Fakee.
This commit is contained in:
MobiusDevelopment
2022-11-18 22:10:54 +00:00
parent 585b9d575a
commit dec3eec800
7 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -52,7 +52,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
private int _targetObjectId = 0; private int _targetObjectId = 0;
private int _count = 0; private int _count = 0;
private final Set<Integer> _ingridients = new HashSet<>(); private final Set<Integer> _ingredients = new HashSet<>();
@Override @Override
public void read(ReadablePacket packet) public void read(ReadablePacket packet)
@@ -61,14 +61,14 @@ public class RequestExTryEnchantArtifact implements ClientPacket
_count = packet.readInt(); _count = packet.readInt();
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
_ingridients.add(packet.readInt()); _ingredients.add(packet.readInt());
} }
} }
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
if (!_ingridients.contains(_targetObjectId)) if (_ingredients.contains(_targetObjectId))
{ {
return; return;
} }
@@ -79,7 +79,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingridients.size())) if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -111,7 +111,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
needCount = 2; needCount = 2;
} }
if ((needCount == 0) || (needCount != _ingridients.size())) if ((needCount == 0) || (needCount != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -144,7 +144,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
for (int objectId : _ingridients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingridient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))

12
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -52,7 +52,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
private int _targetObjectId = 0; private int _targetObjectId = 0;
private int _count = 0; private int _count = 0;
private final Set<Integer> _ingridients = new HashSet<>(); private final Set<Integer> _ingredients = new HashSet<>();
@Override @Override
public void read(ReadablePacket packet) public void read(ReadablePacket packet)
@@ -61,14 +61,14 @@ public class RequestExTryEnchantArtifact implements ClientPacket
_count = packet.readInt(); _count = packet.readInt();
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
_ingridients.add(packet.readInt()); _ingredients.add(packet.readInt());
} }
} }
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
if (!_ingridients.contains(_targetObjectId)) if (_ingredients.contains(_targetObjectId))
{ {
return; return;
} }
@@ -79,7 +79,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingridients.size())) if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -111,7 +111,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
needCount = 2; needCount = 2;
} }
if ((needCount == 0) || (needCount != _ingridients.size())) if ((needCount == 0) || (needCount != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -144,7 +144,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
for (int objectId : _ingridients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingridient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))

12
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -52,7 +52,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
private int _targetObjectId = 0; private int _targetObjectId = 0;
private int _count = 0; private int _count = 0;
private final Set<Integer> _ingridients = new HashSet<>(); private final Set<Integer> _ingredients = new HashSet<>();
@Override @Override
public void read(ReadablePacket packet) public void read(ReadablePacket packet)
@@ -61,14 +61,14 @@ public class RequestExTryEnchantArtifact implements ClientPacket
_count = packet.readInt(); _count = packet.readInt();
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
_ingridients.add(packet.readInt()); _ingredients.add(packet.readInt());
} }
} }
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
if (!_ingridients.contains(_targetObjectId)) if (_ingredients.contains(_targetObjectId))
{ {
return; return;
} }
@@ -79,7 +79,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingridients.size())) if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -111,7 +111,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
needCount = 2; needCount = 2;
} }
if ((needCount == 0) || (needCount != _ingridients.size())) if ((needCount == 0) || (needCount != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -144,7 +144,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
for (int objectId : _ingridients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingridient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))

12
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -52,7 +52,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
private int _targetObjectId = 0; private int _targetObjectId = 0;
private int _count = 0; private int _count = 0;
private final Set<Integer> _ingridients = new HashSet<>(); private final Set<Integer> _ingredients = new HashSet<>();
@Override @Override
public void read(ReadablePacket packet) public void read(ReadablePacket packet)
@@ -61,14 +61,14 @@ public class RequestExTryEnchantArtifact implements ClientPacket
_count = packet.readInt(); _count = packet.readInt();
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
_ingridients.add(packet.readInt()); _ingredients.add(packet.readInt());
} }
} }
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
if (!_ingridients.contains(_targetObjectId)) if (_ingredients.contains(_targetObjectId))
{ {
return; return;
} }
@@ -79,7 +79,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingridients.size())) if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -111,7 +111,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
needCount = 2; needCount = 2;
} }
if ((needCount == 0) || (needCount != _ingridients.size())) if ((needCount == 0) || (needCount != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -144,7 +144,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
for (int objectId : _ingridients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingridient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))

12
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -52,7 +52,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
private int _targetObjectId = 0; private int _targetObjectId = 0;
private int _count = 0; private int _count = 0;
private final Set<Integer> _ingridients = new HashSet<>(); private final Set<Integer> _ingredients = new HashSet<>();
@Override @Override
public void read(ReadablePacket packet) public void read(ReadablePacket packet)
@@ -61,14 +61,14 @@ public class RequestExTryEnchantArtifact implements ClientPacket
_count = packet.readInt(); _count = packet.readInt();
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
_ingridients.add(packet.readInt()); _ingredients.add(packet.readInt());
} }
} }
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
if (!_ingridients.contains(_targetObjectId)) if (_ingredients.contains(_targetObjectId))
{ {
return; return;
} }
@@ -79,7 +79,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingridients.size())) if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -111,7 +111,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
needCount = 2; needCount = 2;
} }
if ((needCount == 0) || (needCount != _ingridients.size())) if ((needCount == 0) || (needCount != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -144,7 +144,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
for (int objectId : _ingridients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingridient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))

12
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -52,7 +52,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
private int _targetObjectId = 0; private int _targetObjectId = 0;
private int _count = 0; private int _count = 0;
private final Set<Integer> _ingridients = new HashSet<>(); private final Set<Integer> _ingredients = new HashSet<>();
@Override @Override
public void read(ReadablePacket packet) public void read(ReadablePacket packet)
@@ -61,14 +61,14 @@ public class RequestExTryEnchantArtifact implements ClientPacket
_count = packet.readInt(); _count = packet.readInt();
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
_ingridients.add(packet.readInt()); _ingredients.add(packet.readInt());
} }
} }
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
if (!_ingridients.contains(_targetObjectId)) if (_ingredients.contains(_targetObjectId))
{ {
return; return;
} }
@@ -79,7 +79,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingridients.size())) if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -111,7 +111,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
needCount = 2; needCount = 2;
} }
if ((needCount == 0) || (needCount != _ingridients.size())) if ((needCount == 0) || (needCount != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -144,7 +144,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
for (int objectId : _ingridients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingridient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))

12
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -52,7 +52,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
private int _targetObjectId = 0; private int _targetObjectId = 0;
private int _count = 0; private int _count = 0;
private final Set<Integer> _ingridients = new HashSet<>(); private final Set<Integer> _ingredients = new HashSet<>();
@Override @Override
public void read(ReadablePacket packet) public void read(ReadablePacket packet)
@@ -61,14 +61,14 @@ public class RequestExTryEnchantArtifact implements ClientPacket
_count = packet.readInt(); _count = packet.readInt();
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
_ingridients.add(packet.readInt()); _ingredients.add(packet.readInt());
} }
} }
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
if (!_ingridients.contains(_targetObjectId)) if (_ingredients.contains(_targetObjectId))
{ {
return; return;
} }
@@ -79,7 +79,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingridients.size())) if (player.hasBlockActions() || player.isInStoreMode() || player.isProcessingRequest() || player.isFishing() || player.isInTraingCamp() || (_count != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -111,7 +111,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
needCount = 2; needCount = 2;
} }
if ((needCount == 0) || (needCount != _ingridients.size())) if ((needCount == 0) || (needCount != _ingredients.size()))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -144,7 +144,7 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
for (int objectId : _ingridients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingridient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))