diff --git a/src/services/objects/ObjectCreator.java b/src/services/objects/ObjectCreator.java index 55df541c0..46c52cf43 100644 --- a/src/services/objects/ObjectCreator.java +++ b/src/services/objects/ObjectCreator.java @@ -75,9 +75,9 @@ public final class ObjectCreator { if (!template.endsWith(".iff")) return null; ObjectData attributes = (ObjectData) ClientFactory.getInfoFromFile(ClientFactory.formatToSharedFile(template), true); - if(attributes == null) - return null; - GameObjectType type = GameObjectType.getTypeFromId((Integer) attributes.getAttribute(ObjectDataAttribute.GAME_OBJECT_TYPE)); + if(attributes == null) + return null; + GameObjectType type = GameObjectType.getTypeFromId((Integer) attributes.getAttribute(ObjectDataAttribute.GAME_OBJECT_TYPE)); SWGObject obj = createObjectFromType(objectId, template, type); if (obj == null) return null; diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java index 70dec4a3d..a71ca57ae 100644 --- a/src/services/spawn/SpawnerService.java +++ b/src/services/spawn/SpawnerService.java @@ -143,17 +143,17 @@ public final class SpawnerService extends Service { createNPC(parent, loc, set.getString("iff"), set.getString("creature_name"), set.getString("mood")); } - private boolean createNPC(SWGObject parent, Location loc, String iff, String name, String moodAnimation) { - CreatureObject object = (CreatureObject) objectManager.createObject(parent, createTemplate(getRandomIff(iff)), loc, false); - boolean objectCreated = object != null; - if (objectCreated) { - object.setName(getCreatureName(name)); - if (!moodAnimation.equals(IDLE_MOOD)) { - object.setMoodAnimation(moodAnimation); - } - } - return objectCreated; - } + private boolean createNPC(SWGObject parent, Location loc, String iff, String name, String moodAnimation) { + CreatureObject object = (CreatureObject) objectManager.createObject(parent, createTemplate(getRandomIff(iff)), loc, false); + boolean objectCreated = object != null; + if (objectCreated) { + object.setName(getCreatureName(name)); + if (!moodAnimation.equals(IDLE_MOOD)) { + object.setMoodAnimation(moodAnimation); + } + } + return objectCreated; + } private String getCreatureName(String name) { return name.replace("(", "\n(");