lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed probable RequestExRqItemLink NPE.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket
public void run(L2GameClient client) public void run(L2GameClient client)
{ {
final L2Object object = L2World.getInstance().findObject(_objectId); final L2Object object = L2World.getInstance().findObject(_objectId);
if (object.isItem()) if ((object != null) && object.isItem())
{ {
final L2ItemInstance item = (L2ItemInstance) object; final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished()) if (item.isPublished())

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket
public void run(L2GameClient client) public void run(L2GameClient client)
{ {
final L2Object object = L2World.getInstance().findObject(_objectId); final L2Object object = L2World.getInstance().findObject(_objectId);
if (object.isItem()) if ((object != null) && object.isItem())
{ {
final L2ItemInstance item = (L2ItemInstance) object; final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished()) if (item.isPublished())

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket
public void run(L2GameClient client) public void run(L2GameClient client)
{ {
final L2Object object = L2World.getInstance().findObject(_objectId); final L2Object object = L2World.getInstance().findObject(_objectId);
if (object.isItem()) if ((object != null) && object.isItem())
{ {
final L2ItemInstance item = (L2ItemInstance) object; final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished()) if (item.isPublished())

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket
public void run(L2GameClient client) public void run(L2GameClient client)
{ {
final L2Object object = L2World.getInstance().findObject(_objectId); final L2Object object = L2World.getInstance().findObject(_objectId);
if (object.isItem()) if ((object != null) && object.isItem())
{ {
final L2ItemInstance item = (L2ItemInstance) object; final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished()) if (item.isPublished())

13
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -40,16 +40,13 @@ public class RequestExRqItemLink implements IClientIncomingPacket
@Override @Override
public void run(L2GameClient client) 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); final L2ItemInstance item = (L2ItemInstance) object;
if (object.isItem()) if (item.isPublished())
{ {
final L2ItemInstance item = (L2ItemInstance) object; client.sendPacket(new ExRpItemLink(item));
if (item.isPublished())
{
client.sendPacket(new ExRpItemLink(item));
}
} }
} }
} }

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket
public void run(L2GameClient client) public void run(L2GameClient client)
{ {
final L2Object object = L2World.getInstance().findObject(_objectId); final L2Object object = L2World.getInstance().findObject(_objectId);
if (object.isItem()) if ((object != null) && object.isItem())
{ {
final L2ItemInstance item = (L2ItemInstance) object; final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished()) if (item.isPublished())

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket
public void run(L2GameClient client) public void run(L2GameClient client)
{ {
final L2Object object = L2World.getInstance().findObject(_objectId); final L2Object object = L2World.getInstance().findObject(_objectId);
if (object.isItem()) if ((object != null) && object.isItem())
{ {
final L2ItemInstance item = (L2ItemInstance) object; final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished()) if (item.isPublished())

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket
public void run(L2GameClient client) public void run(L2GameClient client)
{ {
final L2Object object = L2World.getInstance().findObject(_objectId); final L2Object object = L2World.getInstance().findObject(_objectId);
if (object.isItem()) if ((object != null) && object.isItem())
{ {
final L2ItemInstance item = (L2ItemInstance) object; final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished()) if (item.isPublished())