From 55cc9bb5643f66190861dab672632ac10b30c5c2 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 9 Sep 2022 23:21:20 +0000 Subject: [PATCH] Handle RequestExTryToPutEnchantTargetItem illegal player action. --- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 18 +++++++++++++----- .../RequestExTryToPutEnchantTargetItem.java | 13 +++++++++++-- .../RequestExTryToPutEnchantTargetItem.java | 13 +++++++++++-- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 16 ++++++++++++---- .../RequestExTryToPutEnchantTargetItem.java | 18 +++++++++++++----- 26 files changed, 312 insertions(+), 102 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java index 8110271a9e..3e19060c3c 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets.enchant; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -60,16 +62,22 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - request.setEnchantLevel(player.getInventory().getItemByObjectId(_objectId).getEnchantLevel()); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel())) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 44f3a72f4f..9db7f7c0e9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -54,13 +56,19 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - final Item item = player.getInventory().getItemByObjectId(_objectId); final Item scroll = player.getInventory().getItemByObjectId(player.getActiveEnchantItemId()); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { @@ -73,6 +81,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } + player.setEnchanting(true); player.setActiveEnchantTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 44f3a72f4f..9db7f7c0e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -54,13 +56,19 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - final Item item = player.getInventory().getItemByObjectId(_objectId); final Item scroll = player.getInventory().getItemByObjectId(player.getActiveEnchantItemId()); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { @@ -73,6 +81,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } + player.setEnchanting(true); player.setActiveEnchantTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index ed8b71ad6d..98fd4d0884 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -56,15 +58,21 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java index 8110271a9e..3e19060c3c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets.enchant; +import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; 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.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList; +import org.l2jmobius.gameserver.util.Util; /** * @author KenM @@ -60,16 +62,22 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setEnchantingItem(_objectId); - request.setEnchantLevel(player.getInventory().getItemByObjectId(_objectId).getEnchantLevel()); - - final Item item = request.getEnchantingItem(); final Item scroll = request.getEnchantingScroll(); - if ((item == null) || (scroll == null)) + if (scroll == null) { 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); if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel())) {