Fixed probable RequestExRqItemLink NPE.

This commit is contained in:
MobiusDev 2018-09-06 22:48:45 +00:00
parent cd1b1b02f3
commit 534e14932b
8 changed files with 12 additions and 15 deletions

View File

@ -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())

View File

@ -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())

View File

@ -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())

View File

@ -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())

View File

@ -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));
}
}
}

View File

@ -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())

View File

@ -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())

View File

@ -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())