Fixed ShapeShiftingItemRequest NPE.

This commit is contained in:
MobiusDevelopment
2019-07-05 00:35:11 +00:00
parent 1eff3299d8
commit fcf378e880
12 changed files with 48 additions and 0 deletions

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }

View File

@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest
@Override @Override
public boolean isUsing(int objectId) public boolean isUsing(int objectId)
{ {
if ((_appearanceStone == null) || (_appearanceExtractItem == null))
{
return false;
}
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
} }
} }