From fcf378e880909e9a7c07eedbd1c60a2f7406e1cf Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 5 Jul 2019 00:35:11 +0000 Subject: [PATCH] Fixed ShapeShiftingItemRequest NPE. --- .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ .../model/actor/request/ShapeShiftingItemRequest.java | 4 ++++ 12 files changed, 48 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 0957946c8e..9763bb2973 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -68,6 +68,10 @@ public class ShapeShiftingItemRequest extends AbstractRequest @Override public boolean isUsing(int objectId) { + if ((_appearanceStone == null) || (_appearanceExtractItem == null)) + { + return false; + } return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId())); } }