Handle RequestExTryToPutEnchantTargetItem illegal player action.

This commit is contained in:
MobiusDevelopment
2022-09-09 23:21:20 +00:00
parent 94d2f4ae6c
commit 55cc9bb564
26 changed files with 312 additions and 102 deletions

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets.enchant; package org.l2jmobius.gameserver.network.clientpackets.enchant;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -30,6 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.EnchantResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantScrollItemResult; import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantScrollItemResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList; import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -60,16 +62,22 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
request.setEnchantLevel(player.getInventory().getItemByObjectId(_objectId).getEnchantLevel());
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
request.setEnchantLevel(item.getEnchantLevel());
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel())) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel()))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -54,13 +56,19 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
final Item scroll = player.getInventory().getItemByObjectId(player.getActiveEnchantItemId()); final Item scroll = player.getInventory().getItemByObjectId(player.getActiveEnchantItemId());
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {
@ -73,6 +81,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
} }
return; return;
} }
player.setEnchanting(true); player.setEnchanting(true);
player.setActiveEnchantTimestamp(System.currentTimeMillis()); player.setActiveEnchantTimestamp(System.currentTimeMillis());
player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId));

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -54,13 +56,19 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
final Item scroll = player.getInventory().getItemByObjectId(player.getActiveEnchantItemId()); final Item scroll = player.getInventory().getItemByObjectId(player.getActiveEnchantItemId());
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {
@ -73,6 +81,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
} }
return; return;
} }
player.setEnchanting(true); player.setEnchanting(true);
player.setActiveEnchantTimestamp(System.currentTimeMillis()); player.setActiveEnchantTimestamp(System.currentTimeMillis());
player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId));

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets.enchant; package org.l2jmobius.gameserver.network.clientpackets.enchant;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemData;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@ -30,6 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.EnchantResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantScrollItemResult; import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantScrollItemResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList; import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList;
import org.l2jmobius.gameserver.util.Util;
/** /**
* @author KenM * @author KenM
@ -60,16 +62,22 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return; return;
} }
request.setEnchantingItem(_objectId);
request.setEnchantLevel(player.getInventory().getItemByObjectId(_objectId).getEnchantLevel());
final Item item = request.getEnchantingItem();
final Item scroll = request.getEnchantingScroll(); final Item scroll = request.getEnchantingScroll();
if ((item == null) || (scroll == null)) if (scroll == null)
{ {
return; return;
} }
final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null)
{
Util.handleIllegalPlayerAction(player, "RequestExTryToPutEnchantTargetItem: " + player + " tried to cheat using a packet manipulation tool! Ban this player!", Config.DEFAULT_PUNISH);
return;
}
request.setEnchantingItem(_objectId);
request.setEnchantLevel(item.getEnchantLevel());
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel())) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel()))
{ {