Stacked breakables could overflow the stack, whoops!

Interrupt · Oct 8, 2020 · 10d9f77 · 10d9f77
1 parent cea3098
commit 10d9f77
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Dungeoneer/src/com/interrupt/dungeoneer/entities/Breakable.java b/Dungeoneer/src/com/interrupt/dungeoneer/entities/Breakable.java
@@ -233,7 +233,9 @@ public void tick(Level level, float delta) {
 		// move any entities standing on us
 		entityStandingOnUsCache.addAll(level.getEntitiesColliding(x, y, z + 0.06f, this));
 
-		for(Entity e : entityStandingOnUsCache) {
+		for(int i = 0; i < entityStandingOnUsCache.size; i++) {
+			Entity e = entityStandingOnUsCache.get(i);
+
 			if(e.isDynamic) {
 				e.physicsSleeping = false;
 
@@ -242,8 +244,10 @@ public void tick(Level level, float delta) {
 				e.ya += (y - yBefore) * 0.3f;
 
 				// Tick this entity now, so it can tick any entities on top of itself
-				e.tick(level, delta);
-				e.skipTick = true;
+				if(!e.skipTick) {
+					e.skipTick = true;
+					e.tick(level, delta);
+				}
 			}
 		}