diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 369014f1de..064807bed7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket public void run(L2GameClient client) { final L2Object object = L2World.getInstance().findObject(_objectId); - if (object.isItem()) + if ((object != null) && object.isItem()) { final L2ItemInstance item = (L2ItemInstance) object; if (item.isPublished()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 369014f1de..064807bed7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket public void run(L2GameClient client) { final L2Object object = L2World.getInstance().findObject(_objectId); - if (object.isItem()) + if ((object != null) && object.isItem()) { final L2ItemInstance item = (L2ItemInstance) object; if (item.isPublished()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 369014f1de..064807bed7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket public void run(L2GameClient client) { final L2Object object = L2World.getInstance().findObject(_objectId); - if (object.isItem()) + if ((object != null) && object.isItem()) { final L2ItemInstance item = (L2ItemInstance) object; if (item.isPublished()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 369014f1de..064807bed7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket public void run(L2GameClient client) { final L2Object object = L2World.getInstance().findObject(_objectId); - if (object.isItem()) + if ((object != null) && object.isItem()) { final L2ItemInstance item = (L2ItemInstance) object; if (item.isPublished()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 9d3bcb9fd4..801d7d7e7a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -40,16 +40,13 @@ public class RequestExRqItemLink implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (client != null) + final L2Object object = L2World.getInstance().findObject(_objectId); + if ((object != null) && object.isItem()) { - final L2Object object = L2World.getInstance().findObject(_objectId); - if (object.isItem()) + final L2ItemInstance item = (L2ItemInstance) object; + if (item.isPublished()) { - final L2ItemInstance item = (L2ItemInstance) object; - if (item.isPublished()) - { - client.sendPacket(new ExRpItemLink(item)); - } + client.sendPacket(new ExRpItemLink(item)); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 369014f1de..064807bed7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket public void run(L2GameClient client) { final L2Object object = L2World.getInstance().findObject(_objectId); - if (object.isItem()) + if ((object != null) && object.isItem()) { final L2ItemInstance item = (L2ItemInstance) object; if (item.isPublished()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 369014f1de..064807bed7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket public void run(L2GameClient client) { final L2Object object = L2World.getInstance().findObject(_objectId); - if (object.isItem()) + if ((object != null) && object.isItem()) { final L2ItemInstance item = (L2ItemInstance) object; if (item.isPublished()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 369014f1de..064807bed7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket public void run(L2GameClient client) { final L2Object object = L2World.getInstance().findObject(_objectId); - if (object.isItem()) + if ((object != null) && object.isItem()) { final L2ItemInstance item = (L2ItemInstance) object; if (item.isPublished())