Merge remote-tracking branch 'origin/main'

# Conflicts: # SMIMS-Game/MyWorld.class # SMIMS-Game/Player.class # SMIMS-Game/Player.java # SMIMS-Game/project.greenfoot
2026-09-17 11:13:42 +02:00
parent aa07effa13 6ab5576115
commit b5bbd00cc1
7 changed files with 90 additions and 73 deletions
@@ -57,8 +57,8 @@ public class MyWorld extends World
        plattform2.setLocation(320,367);
        plattform2.setLocation(312,371);
        plattform2.setLocation(308,382);
-        Healthbar healthbar = new Healthbar();
-        addObject(healthbar,50,50);
+        //Healthbar healthbar = new Healthbar();
+        //addObject(healthbar,50,50);
        Heart heart = new Heart();
        addObject(heart,371,27);
        Heart heart2 = new Heart();