Performance Improvements

Code/Components/EntityContainer.cs

@@ -200,6 +200,16 @@ protected virtual void RemoveContained(IEntityHandler handler)
 		handler.OnDetach(this);
 	}
 
+	public virtual bool ContainsEntity(Entity entity)
+	{
+		foreach (IEntityHandler handler in Contained)
+		{
+			if (handler.Entity == entity) 
+				return true;
+		} 
+		return false;
+	}
+
 	protected List<Tuple<string, int>> ParseList(string list)
 	{
 		return list.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(entry =>

Code/Entities/Containers/HoldableContainer.cs

@@ -327,7 +327,7 @@ public override void Update()
 				foreach (SeekerBarrier barrier in Scene.Tracker.GetEntities<SeekerBarrier>())
 				{
 					barrier.Collidable = true;
-					var collided = CollideCheck(barrier) && !_Container.GetEntities().Contains(barrier);
+					var collided = CollideCheck(barrier) && !_Container.ContainsEntity(barrier);
 					barrier.Collidable = false;
 
 					if (collided)
@@ -525,12 +525,12 @@ public override void Render()
 
 	public override bool IsRiding(Solid solid)
 	{
-		return HasGravity && !_Container.GetEntities().Contains(solid) && base.IsRiding(solid);
+		return HasGravity && !_Container.ContainsEntity(solid) && base.IsRiding(solid);
 	}
 
 	public override bool IsRiding(JumpThru jumpThru)
 	{
-		return HasGravity && !_Container.GetEntities().Contains(jumpThru) && base.IsRiding(jumpThru);
+		return HasGravity && !_Container.ContainsEntity(jumpThru) && base.IsRiding(jumpThru);
 	}
 
 	private IEnumerator DestroyRoutine()

Code/Entities/Modifiers/CollidableModifier.cs

@@ -36,7 +36,7 @@ public CollidableModifier(EntityData data, Vector2 offset) : base(data.Position
 
 		Add(Container = new EntityContainer(data)
 		{
-			IsValid = e => !(e is Solidifier solidifier && Container.GetEntities().Contains(solidifier.Entity)) && e is not Hazard,
+			IsValid = e => !(e is Solidifier solidifier && Container.ContainsEntity(solidifier.Entity)) && e is not Hazard,
 			DefaultIgnored = e => e.Get<EntityContainer>() != null,
 			OnAttach = h => OnAttach(h.Entity),
 			OnDetach = h => OnDetach(h.Entity)

Code/MiscHooks.cs

@@ -297,20 +297,28 @@ private static void HookLevelEntityLoading(ILCursor cursor, string type)
 
 	private static void Collide_Check_Entity_Entity(ILContext il)
 	{
-		ILCursor cursor = new ILCursor(il);
-		ILLabel label = null;
-		if(cursor.TryGotoNext(MoveType.After, i => i.MatchBeq(out label)))
+		ILCursor cursor = new(il);
+
+		if (cursor.TryGotoNext(MoveType.After, i => i.MatchCallvirt<Collider>("Collide")))
 		{
+			ILLabel returnResult = cursor.DefineLabel();
+			cursor.Emit(OpCodes.Dup);
+			cursor.Emit(OpCodes.Brfalse, returnResult);
+
+			// return/calculate !CheckContainers(a, b) only if the collision was true in the first place
+			cursor.Emit(OpCodes.Pop);
 			cursor.Emit(OpCodes.Ldarg_0);
 			cursor.Emit(OpCodes.Ldarg_1);
 			cursor.Emit(OpCodes.Call, typeof(MiscHooks).GetMethod(nameof(CheckContainers), BindingFlags.NonPublic | BindingFlags.Static));
-			cursor.Emit(OpCodes.Brtrue, label);
+			cursor.Emit(OpCodes.Ldc_I4_0);
+			cursor.Emit(OpCodes.Ceq);
+			cursor.MarkLabel(returnResult);
 		}
 	}
 	// If this statement is *true*, Collide Check returns *false*
 	private static bool CheckContainers(Entity a, Entity b) =>
-		(a is IContainer iA && iA.Container is { } aContainer && aContainer != null && !aContainer.CollideWithContained && aContainer.GetEntities().Contains(b)) ||
-		(b is IContainer iB && iB.Container is { } bContainer && bContainer != null && !bContainer.CollideWithContained && bContainer.GetEntities().Contains(a)) ||
+		(a is IContainer iA && iA.Container is { } aContainer && !aContainer.CollideWithContained && aContainer.ContainsEntity(b)) ||
+		(b is IContainer iB && iB.Container is { } bContainer && !bContainer.CollideWithContained && bContainer.ContainsEntity(a)) ||
 		(a is CollidableModifier.Solidifier aSolid && aSolid.Entity == b) ||
 		(b is CollidableModifier.Solidifier bSolid && bSolid.Entity == a); 
 
@@ -726,7 +734,7 @@ private static bool Player_IsRiding_Solid(On.Celeste.Player.orig_IsRiding_Solid
 	{
 		if (self.StateMachine.State == Player.StClimb)
 		{
-			var data = DynamicData.For(self);
+			var data = DynamicData.For(self);
 			if (data.Get("EeveeHelper_cPopDelay") is float cPopDelay && cPopDelay > 0f)
 			{
 				return self.CollideCheck(solid, self.Position + new Vector2((float)self.Facing, -1f));