projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-12 22:45:18 -04:00
Code Issues Projects Releases Wiki Activity

Added proper handling for when slot descriptor/arrangement is null

Browse Source
This commit is contained in:
Obique
2019-02-09 14:28:48 -06:00
parent e31c0516d4
commit fd60f229f5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/resources/support/objects/ObjectCreator.java
+7 -2
View File
@@ -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<String> 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<List<String>> arrangement = DataLoader.slotArrangements().getArrangement(slotArrangement);
if (arrangement != null)
object.setArrangement(arrangement); // The slots this object can go into
}
}