Merge remote-tracking branch 'origin/main'

# Conflicts: # SMIMS-Game/Groundflower.class # SMIMS-Game/Groundflower.java # SMIMS-Game/MyWorld.class # SMIMS-Game/Player.class # SMIMS-Game/Player.java # SMIMS-Game/project.greenfoot
2026-09-17 09:44:40 +02:00
parent c0c5151c41 236a363572
commit ddba231979
16 changed files with 148 additions and 139 deletions
@@ -120,6 +120,9 @@ public class Player extends Actor
            getWorld().removeObjects(getIntersectingObjects(Enemy.class));
            getWorld().removeObjects(getWorld().getObjects(Spike.class));

+            getWorld().removeObjects(getIntersectingObjects(Spike.class));
+            getWorld().removeObject(getWorld().getObjects(Heart.class).get(0));
+            getWorld().removeObject(getWorld().getObjects(Heart.class).get(0));
        }
    }

@@ -159,7 +162,7 @@ public class Player extends Actor
                }
                else
                {
-                    theWorld.addObject((new TemporaryGround(duration)), 200, 550);
+                    theWorld.addObject((new TemporaryGround(duration)), 200, 575);
                }
                break;
        }