junkdog#385: ctor bool param: enable/disable processing LinkSites la…

…cking a link listener
sreich · Apr 28, 2016 · 66ec1e7 · 66ec1e7
1 parent 1b5247a
commit 66ec1e7
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/artemis/src/main/java/com/artemis/link/EntityLinkManager.java b/artemis/src/main/java/com/artemis/link/EntityLinkManager.java
@@ -25,12 +25,15 @@ public class EntityLinkManager extends BaseEntitySystem {
 	final Bag<LinkSite> singleLinkSites = new Bag<LinkSite>();
 	final Bag<Bag<LinkSite>> multiLinkSites = new Bag<Bag<LinkSite>>();
 
-	public EntityLinkManager(Aspect.Builder aspect) {
+	private final boolean requireListener;
+
+	public EntityLinkManager(Aspect.Builder aspect, boolean requireListenerToProcess) {
 		super(aspect);
+		this.requireListener = requireListenerToProcess;
 	}
 
 	public EntityLinkManager() {
-		this(all());
+		this(all(), false);
 	}
 
 	@Override
@@ -39,15 +42,23 @@ protected void initialize() {
 		world.getComponentManager().getTypeFactory().register(listener);
 	}
 
+
 	@Override
 	protected void processSystem() {
 		for (LinkSite ls : singleLinkSites) {
+			if (requireListener && ls.listener == null)
+				continue;
+
 			ls.process();
 		}
 
-		for (Bag<LinkSite> ls : multiLinkSites) {
-			for (int i = 0, s = ls.size(); s > i; i++) {
-				ls.get(i).process();
+		for (Bag<LinkSite> sites : multiLinkSites) {
+			for (int i = 0, s = sites.size(); s > i; i++) {
+				LinkSite ls = sites.get(i);
+				if (requireListener && ls.listener == null)
+					continue;
+
+				ls.process();
 			}
 		}
 	}
@@ -85,14 +96,14 @@ public void register(Class<? extends Component> component, String field, LinkLis
 
 			ComponentType ct = world.getComponentManager().getTypeFactory().getTypeFor(component);
 			for (LinkSite site : singleLinkSites) {
-				if (ct.equals(site.type) && (f == null ||site.field.equals(f))) {
+				if (ct.equals(site.type) && (f == null || site.field.equals(f))) {
 					site.listener = listener;
 				}
 			}
 			for (Bag<LinkSite> ls : multiLinkSites) {
 				for (int i = 0, s = ls.size(); s > i; i++) {
 					LinkSite site = ls.get(i);
-					if (ct.equals(site.type) && (f == null ||site.field.equals(f))) {
+					if (ct.equals(site.type) && (f == null || site.field.equals(f))) {
 						ls.get(i).process();
 					}
 				}