Resolve clash master branch. Solving things twice! Oops.

Author: DaanVanYperen

contrib-core/src/main/java/net/mostlyoriginal/api/plugin/extendedcomponentmapper/M.java

@@ -169,6 +169,17 @@ public A get(Entity e) throws ArrayIndexOutOfBoundsException {
 		return mapper.get(e);
 	}
 
+	@Deprecated
+	public A getSafe(Entity e, boolean forceNewInstance) {
+		A component = mapper.getSafe(e);
+		
+		if(component == null && forceNewInstance) {
+			component = mapper.create(e);
+		}
+		
+		return component;
+	}
+
 	public A get(int entityId) throws ArrayIndexOutOfBoundsException {
 		return mapper.get(entityId);
 	}
@@ -199,4 +210,35 @@ public boolean has(int entityId) {
 	public static <T extends Component> M<T> getFor(Class<T> type, World world) {
 		return world.getSystem(ExtendedComponentMapperManager.class).getFor(type);
 	}
+
+	public A get(Entity e, boolean forceNewInstance) throws ArrayIndexOutOfBoundsException {
+		A component = mapper.get(e);
+		
+		if(component == null && forceNewInstance) {
+			component = mapper.create(e);
+		}
+		
+		return component;
+	}
+
+	public A get(int entityId, boolean forceNewInstance) throws ArrayIndexOutOfBoundsException {
+		A component = mapper.get(entityId);
+		
+		if(component == null && forceNewInstance) {
+			component = mapper.create(entityId);
+		}
+		
+		return component;
+	}
+
+	@Deprecated
+	public A getSafe(int entityId, boolean forceNewInstance) {
+		A component = mapper.getSafe(entityId);
+		
+		if(component == null && forceNewInstance) {
+			component = mapper.create(entityId);
+		}
+		
+		return component;
+	}
 }

contrib-core/src/main/java/net/mostlyoriginal/api/system/core/PassiveSystem.java

@@ -11,13 +11,18 @@
  */
 public class PassiveSystem extends BaseSystem {
 
-    @Override
-    protected void initialize() {
-        setEnabled(false);
+    public PassiveSystem() {
+        
     }
 
     @Override
     protected void processSystem() {
 	    // do nothing!
     }
+    
+    @Override
+    protected boolean checkProcessing() {
+    	setEnabled(false);
+    	return false;
+    }
 }

contrib-core/src/main/java/net/mostlyoriginal/api/system/delegate/DeferredEntityProcessingSystem.java

@@ -28,11 +28,6 @@ public abstract class DeferredEntityProcessingSystem extends BaseEntitySystem {
     private final Aspect.Builder aspect;
     private final EntityProcessPrincipal principal;
 
-    @Override
-    protected void initialize() {
-        setEnabled(false);
-    }
-
     /**
      * Creates an entity system that uses the specified aspect as a matcher
      * against entities.
@@ -45,6 +40,13 @@ public DeferredEntityProcessingSystem(Aspect.Builder aspect, EntityProcessPrinci
         this.aspect = aspect;
         this.principal = principal;
     }
+    
+    @Override
+    protected void initialize() {
+    	super.initialize();
+    	
+    	setEnabled(false);
+    }
 
     /**
    	 * Process a entity this system is interested in.