Fixed improperly destroying GameObjects

andoowhy · Feb 1, 2017 · 0dd59d2 · 0dd59d2
1 parent a1da7c5
commit 0dd59d2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/Constraints/EgoConstraint.cs b/Constraints/EgoConstraint.cs
@@ -39,6 +39,8 @@ protected bool CanUpdate( EgoComponent egoComponent )
     /// <param name="egoComponent"></param>
     public void CreateBundles( EgoComponent egoComponent )
     {
+		if( egoComponent == null ) { return; }
+
 		// Only Create Bundles from the youngest EgoConstraint
 		if( childConstraint != null )
 		{
@@ -98,6 +100,8 @@ public void CreateBundles( EgoComponent egoComponent )
 
 	public void RemoveBundles( EgoComponent egoComponent )
 	{
+		if( egoComponent == null ) { return; }
+
 		RemoveChildBundles( this, egoComponent );
 		RemoveParentBundles( this, egoComponent );
 		rootBundles.Remove( egoComponent );

diff --git a/Ego.cs b/Ego.cs
@@ -26,22 +26,20 @@ public static C AddComponent<C>( EgoComponent egoComponent ) where C : Component
 
 	public static void DestroyGameObject( EgoComponent egoComponent )
 	{
-		EgoEvents<DestroyedGameObject>.AddEvent( new DestroyedGameObject( egoComponent.gameObject, egoComponent ) );
+		var gameObject = egoComponent.gameObject;
+		EgoEvents<DestroyedGameObject>.AddEvent( new DestroyedGameObject( gameObject, egoComponent ) );
+		EgoCleanUp.Destroy( egoComponent.gameObject );
 	}
 
 	public static bool DestroyComponent<C>( EgoComponent egoComponent ) where C : Component
 	{
 		C component = null;
-		if( egoComponent.TryGetComponents<C>( out component ) )
-		{
-			var e = new DestroyedComponent<C>( component, egoComponent );
-			EgoEvents<DestroyedComponent<C>>.AddEvent( e );
-			EgoCleanUp<C>.Destroy( egoComponent, component );
-
-			return true;
-		}
+		if( !egoComponent.TryGetComponents<C>( out component ) ){ return false; }
 
-		return false;
+		var e = new DestroyedComponent<C>( component, egoComponent );
+		EgoEvents<DestroyedComponent<C>>.AddEvent( e );
+		EgoCleanUp<C>.Destroy( egoComponent, component );
+		return true;
 	}
 
 	public static void SetParent( EgoComponent parent, EgoComponent child )

diff --git a/System/EgoSystem.cs b/System/EgoSystem.cs
@@ -24,16 +24,12 @@ public EgoSystem()
 	{
 		constraint = new EC();
 		constraint.SetSystem( this );
-		EgoEvents<AddedGameObject>.AddHandler( Handle );
+		EgoEvents<AddedGameObject>.AddHandler( e => constraint.CreateBundles( e.egoComponent ) );
+		EgoEvents<DestroyedGameObject>.AddHandler( e => constraint.RemoveBundles( e.egoComponent ) );
 	}
 
 	public override void CreateBundles( EgoComponent egoComponent )
 	{
 		constraint.CreateBundles( egoComponent );
 	}
-
-	protected void Handle( AddedGameObject e )
-	{
-		constraint.CreateBundles( e.egoComponent );
-	}
 }