Skip to content

Commit 109e515

Browse files
committed
Make Behavior assets available for modules
1 parent e445fd0 commit 109e515

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

engine/src/main/java/org/terasology/logic/behavior/BehaviorComponent.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717

1818
import org.terasology.entitySystem.Component;
1919
import org.terasology.logic.behavior.asset.BehaviorTree;
20+
import org.terasology.module.sandbox.API;
2021

2122
/**
2223
* Entities with this component are handled by a behavior tree. Default tree to fetch may be set.
2324
*
2425
* @author synopia
2526
*/
27+
@API
2628
public class BehaviorComponent implements Component {
2729
public BehaviorTree tree;
2830
}

engine/src/main/java/org/terasology/logic/behavior/BehaviorNodeComponent.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
package org.terasology.logic.behavior;
1717

1818
import org.terasology.entitySystem.Component;
19+
import org.terasology.module.sandbox.API;
1920
import org.terasology.rendering.nui.Color;
2021

2122
/**
2223
* Defines a renderable node used to display behavior trees.
2324
*
2425
* @author synopia
2526
*/
27+
@API
2628
public class BehaviorNodeComponent implements Component {
2729
public static final BehaviorNodeComponent DEFAULT = new BehaviorNodeComponent();
2830

engine/src/main/java/org/terasology/logic/behavior/asset/BehaviorTree.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.terasology.logic.behavior.BehaviorNodeFactory;
2222
import org.terasology.logic.behavior.nui.RenderableNode;
2323
import org.terasology.logic.behavior.tree.Node;
24+
import org.terasology.module.sandbox.API;
2425

2526
import java.util.List;
2627

@@ -32,6 +33,7 @@
3233
*
3334
* @author synopia
3435
*/
36+
@API
3537
public class BehaviorTree extends Asset<BehaviorTreeData> {
3638
private BehaviorTreeData data;
3739

engine/src/main/java/org/terasology/logic/behavior/tree/SetAnimationNode.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@ public void onInitialize() {
7171
if (getNode().loop != null) {
7272
skeletalMesh.animationPool.clear();
7373
List<?> animationListToLoop = (List<?>) actor().getComponentField(getNode().loop);
74-
for (Object object : animationListToLoop) {
75-
skeletalMesh.animationPool.add((MeshAnimation) object);
74+
if (animationListToLoop != null) {
75+
for (Object object : animationListToLoop) {
76+
skeletalMesh.animationPool.add((MeshAnimation) object);
77+
}
7678
}
7779
}
7880
skeletalMesh.loop = true;

0 commit comments

Comments
 (0)