From fd60f229f5d484b2a03f2e06e42f42b0d4b39fc2 Mon Sep 17 00:00:00 2001 From: Obique Date: Sat, 9 Feb 2019 14:28:48 -0600 Subject: [PATCH] Added proper handling for when slot descriptor/arrangement is null --- .../resources/support/objects/ObjectCreator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/objects/ObjectCreator.java b/src/main/java/com/projectswg/holocore/resources/support/objects/ObjectCreator.java index 03f5ac5a0..854f9d215 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/objects/ObjectCreator.java +++ b/src/main/java/com/projectswg/holocore/resources/support/objects/ObjectCreator.java @@ -53,6 +53,7 @@ import com.projectswg.holocore.resources.support.objects.swg.weapon.WeaponObject import org.jetbrains.annotations.NotNull; import java.lang.reflect.InvocationTargetException; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicLong; @@ -164,11 +165,15 @@ public final class ObjectCreator { String slotArrangement = object.getDataTextAttribute(ObjectDataAttribute.ARRANGEMENT_DESCRIPTOR_FILENAME); if (!slotDescriptor.isEmpty()) { - object.setSlots(DataLoader.slotDescriptors().getSlots(slotDescriptor)); // The slots an object has + List descriptor = DataLoader.slotDescriptors().getSlots(slotDescriptor); + if (descriptor != null) + object.setSlots(descriptor); // The slots an object has } if (!slotArrangement.isEmpty()) { - object.setArrangement(DataLoader.slotArrangements().getArrangement(slotArrangement)); // The slots this object can go into + List> arrangement = DataLoader.slotArrangements().getArrangement(slotArrangement); + if (arrangement != null) + object.setArrangement(arrangement); // The slots this object can go into } }