From df89c6e8dfa2e49799ad11f7e1fd7f8298c893d4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 5 Dec 2022 07:09:20 +0000 Subject: [PATCH] Proper RequestDropItem discard SystemMessageId. Contributed by CostyKiller. --- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- .../gameserver/network/clientpackets/RequestDropItem.java | 8 ++++---- 26 files changed, 104 insertions(+), 104 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index a6f30ef664..3d937aab23 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 5d022ff335..c222b0f89c 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket final Item item = player.getInventory().getItemByObjectId(_objectId); if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP)) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket if (_count > item.getCount()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM()) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; } @@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket // Cannot discard item that the skill is consuming. if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); + player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED); return; }