From 3ed319e4316cb0f0cc1219905789fd2112b37f9c Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 29 Aug 2018 18:21:28 +0000 Subject: [PATCH] Fixed freight withdraw issues. --- .../gameserver/model/actor/instance/L2PcInstance.java | 5 ++--- .../gameserver/network/clientpackets/RequestPackageSend.java | 5 +++++ .../gameserver/model/actor/instance/L2PcInstance.java | 5 ++--- .../gameserver/network/clientpackets/RequestPackageSend.java | 5 +++++ .../gameserver/model/actor/instance/L2PcInstance.java | 5 ++--- .../gameserver/network/clientpackets/RequestPackageSend.java | 5 +++++ .../gameserver/model/actor/instance/L2PcInstance.java | 5 ++--- .../gameserver/network/clientpackets/RequestPackageSend.java | 5 +++++ .../java/com/l2jmobius/gameserver/handler/BypassHandler.java | 4 ---- .../gameserver/network/clientpackets/RequestPackageSend.java | 5 +++++ .../dist/game/data/html/{merchant => warehouse}/32478.htm | 0 .../dist/game/data/stats/npcs/32400-32499.xml | 2 +- .../gameserver/model/actor/instance/L2PcInstance.java | 5 ++--- .../gameserver/network/clientpackets/RequestPackageSend.java | 5 +++++ .../dist/game/data/html/{merchant => warehouse}/32478.htm | 0 .../dist/game/data/stats/npcs/32400-32499.xml | 2 +- .../gameserver/model/actor/instance/L2PcInstance.java | 5 ++--- .../gameserver/network/clientpackets/RequestPackageSend.java | 5 +++++ .../dist/game/data/html/{merchant => warehouse}/32478.htm | 0 .../dist/game/data/stats/npcs/32400-32499.xml | 2 +- .../gameserver/model/actor/instance/L2PcInstance.java | 5 ++--- .../gameserver/network/clientpackets/RequestPackageSend.java | 5 +++++ 22 files changed, 57 insertions(+), 28 deletions(-) rename L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/{merchant => warehouse}/32478.htm (100%) rename L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/{merchant => warehouse}/32478.htm (100%) rename L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/{merchant => warehouse}/32478.htm (100%) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index e9395016be..88da47ca71 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -3817,7 +3817,7 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance checkItemManipulation(int objectId, long count, String action) { - // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check + // TODO: if we remove objects that are not visible from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); @@ -3855,7 +3855,7 @@ public final class L2PcInstance extends L2Playable return null; } - // We cannot put a Weapon with Augmention in WH while casting (Possible Exploit) + // We cannot put a Weapon with Augmentation in WH while casting (Possible Exploit) if (item.isAugmented() && isCastingNow()) { return null; @@ -11013,7 +11013,6 @@ public final class L2PcInstance extends L2Playable { clanMember.setPlayerInstance(null); } - } catch (Exception e) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 05962263f7..bd64e0a231 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -191,6 +192,10 @@ public class RequestPackageSend implements IClientIncomingPacket playerIU.addRemovedItem(oldItem); } } + + // Remove item objects from the world. + L2World.getInstance().removeObject(oldItem); + L2World.getInstance().removeObject(newItem); } warehouse.deleteMe(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 5814c24adc..14701d8619 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -3823,7 +3823,7 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance checkItemManipulation(int objectId, long count, String action) { - // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check + // TODO: if we remove objects that are not visible from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); @@ -3861,7 +3861,7 @@ public final class L2PcInstance extends L2Playable return null; } - // We cannot put a Weapon with Augmention in WH while casting (Possible Exploit) + // We cannot put a Weapon with Augmentation in WH while casting (Possible Exploit) if (item.isAugmented() && isCastingNow()) { return null; @@ -11020,7 +11020,6 @@ public final class L2PcInstance extends L2Playable { clanMember.setPlayerInstance(null); } - } catch (Exception e) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 05962263f7..bd64e0a231 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -191,6 +192,10 @@ public class RequestPackageSend implements IClientIncomingPacket playerIU.addRemovedItem(oldItem); } } + + // Remove item objects from the world. + L2World.getInstance().removeObject(oldItem); + L2World.getInstance().removeObject(newItem); } warehouse.deleteMe(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 383a39e3d9..901bbd55d4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -3825,7 +3825,7 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance checkItemManipulation(int objectId, long count, String action) { - // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check + // TODO: if we remove objects that are not visible from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); @@ -3863,7 +3863,7 @@ public final class L2PcInstance extends L2Playable return null; } - // We cannot put a Weapon with Augmention in WH while casting (Possible Exploit) + // We cannot put a Weapon with Augmentation in WH while casting (Possible Exploit) if (item.isAugmented() && isCastingNow()) { return null; @@ -11030,7 +11030,6 @@ public final class L2PcInstance extends L2Playable { clanMember.setPlayerInstance(null); } - } catch (Exception e) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 05962263f7..bd64e0a231 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -191,6 +192,10 @@ public class RequestPackageSend implements IClientIncomingPacket playerIU.addRemovedItem(oldItem); } } + + // Remove item objects from the world. + L2World.getInstance().removeObject(oldItem); + L2World.getInstance().removeObject(newItem); } warehouse.deleteMe(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index a448f5566b..92cca71bd1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -3816,7 +3816,7 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance checkItemManipulation(int objectId, long count, String action) { - // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check + // TODO: if we remove objects that are not visible from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); @@ -3854,7 +3854,7 @@ public final class L2PcInstance extends L2Playable return null; } - // We cannot put a Weapon with Augmention in WH while casting (Possible Exploit) + // We cannot put a Weapon with Augmentation in WH while casting (Possible Exploit) if (item.isAugmented() && isCastingNow()) { return null; @@ -11014,7 +11014,6 @@ public final class L2PcInstance extends L2Playable { clanMember.setPlayerInstance(null); } - } catch (Exception e) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 05962263f7..bd64e0a231 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -191,6 +192,10 @@ public class RequestPackageSend implements IClientIncomingPacket playerIU.addRemovedItem(oldItem); } } + + // Remove item objects from the world. + L2World.getInstance().removeObject(oldItem); + L2World.getInstance().removeObject(newItem); } warehouse.deleteMe(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/BypassHandler.java index a7821e9cd4..5aae386b59 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/BypassHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/BypassHandler.java @@ -56,10 +56,6 @@ public class BypassHandler implements IHandler { command = command.substring(0, command.indexOf(" ")); } - else if (command.contains("_")) - { - command = command.substring(0, command.indexOf("_")); - } return _datatable.get(command.toLowerCase()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 9e926ff83a..e3859a59bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -20,6 +20,7 @@ import java.util.logging.Level; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -195,6 +196,10 @@ public class RequestPackageSend implements IClientIncomingPacket playerIU.addRemovedItem(oldItem); } } + + // Remove item objects from the world. + L2World.getInstance().removeObject(oldItem); + L2World.getInstance().removeObject(newItem); } warehouse.deleteMe(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/merchant/32478.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/warehouse/32478.htm similarity index 100% rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/merchant/32478.htm rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/warehouse/32478.htm diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/32400-32499.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/32400-32499.xml index 7aaf67ab61..36801163a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/32400-32499.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/32400-32499.xml @@ -1,6 +1,6 @@ - + HUMAN FEMALE diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 5ef43860ae..49de005988 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -3793,7 +3793,7 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance checkItemManipulation(int objectId, long count, String action) { - // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check + // TODO: if we remove objects that are not visible from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); @@ -3831,7 +3831,7 @@ public final class L2PcInstance extends L2Playable return null; } - // We cannot put a Weapon with Augmention in WH while casting (Possible Exploit) + // We cannot put a Weapon with Augmentation in WH while casting (Possible Exploit) if (item.isAugmented() && isCastingNow()) { return null; @@ -10954,7 +10954,6 @@ public final class L2PcInstance extends L2Playable { clanMember.setPlayerInstance(null); } - } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 05962263f7..bd64e0a231 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -191,6 +192,10 @@ public class RequestPackageSend implements IClientIncomingPacket playerIU.addRemovedItem(oldItem); } } + + // Remove item objects from the world. + L2World.getInstance().removeObject(oldItem); + L2World.getInstance().removeObject(newItem); } warehouse.deleteMe(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/merchant/32478.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/warehouse/32478.htm similarity index 100% rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/merchant/32478.htm rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/warehouse/32478.htm diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/32400-32499.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/32400-32499.xml index 7aaf67ab61..36801163a5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/32400-32499.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/32400-32499.xml @@ -1,6 +1,6 @@ - + HUMAN FEMALE diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 73a9b3899c..375c3eee2b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -3793,7 +3793,7 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance checkItemManipulation(int objectId, long count, String action) { - // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check + // TODO: if we remove objects that are not visible from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); @@ -3831,7 +3831,7 @@ public final class L2PcInstance extends L2Playable return null; } - // We cannot put a Weapon with Augmention in WH while casting (Possible Exploit) + // We cannot put a Weapon with Augmentation in WH while casting (Possible Exploit) if (item.isAugmented() && isCastingNow()) { return null; @@ -10954,7 +10954,6 @@ public final class L2PcInstance extends L2Playable { clanMember.setPlayerInstance(null); } - } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 05962263f7..bd64e0a231 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -191,6 +192,10 @@ public class RequestPackageSend implements IClientIncomingPacket playerIU.addRemovedItem(oldItem); } } + + // Remove item objects from the world. + L2World.getInstance().removeObject(oldItem); + L2World.getInstance().removeObject(newItem); } warehouse.deleteMe(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/merchant/32478.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/warehouse/32478.htm similarity index 100% rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/merchant/32478.htm rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/warehouse/32478.htm diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/32400-32499.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/32400-32499.xml index d56c7960c2..d3e5e97e66 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/32400-32499.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/32400-32499.xml @@ -1,6 +1,6 @@  - + HUMAN FEMALE diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 56fe8178e2..561854ff04 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -3793,7 +3793,7 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance checkItemManipulation(int objectId, long count, String action) { - // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check + // TODO: if we remove objects that are not visible from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); @@ -3831,7 +3831,7 @@ public final class L2PcInstance extends L2Playable return null; } - // We cannot put a Weapon with Augmention in WH while casting (Possible Exploit) + // We cannot put a Weapon with Augmentation in WH while casting (Possible Exploit) if (item.isAugmented() && isCastingNow()) { return null; @@ -10956,7 +10956,6 @@ public final class L2PcInstance extends L2Playable { clanMember.setPlayerInstance(null); } - } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8b367c7d9f..425bfa92e1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -191,6 +192,10 @@ public class RequestPackageSend implements IClientIncomingPacket playerIU.addRemovedItem(oldItem); } } + + // Remove item objects from the world. + L2World.getInstance().removeObject(oldItem); + L2World.getInstance().removeObject(newItem); } warehouse.deleteMe();