Admin/SMIMS_2026_2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/Player.class
#	SMIMS-Game/project.greenfoot
This commit is contained in:
Caspar
2026-09-17 09:28:50 +02:00
parent c719e5b053 b3a951626c
commit 6215bff73d
27 changed files with 109 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SMIMS-Game/Player.java
+7 -2
View File
@@ -112,12 +112,17 @@ public class Player extends Actor
public void collision(){
if (getIntersectingObjects(Projectile.class).size()>0
|| getIntersectingObjects(Enemy.class).size()>0)
|| getIntersectingObjects(Enemy.class).size()>0
|| getIntersectingObjects(Spike.class).size()>0)
{
health--;
getWorld().removeObjects(getIntersectingObjects(Projectile.class));
getWorld().removeObjects(getIntersectingObjects(Enemy.class));
getWorld().removeObjects(getIntersectingObjects(Spike.class));
getWorld().removeObject(getWorld().getObjects(Heart.class).get(0));
//if(health<=2){
// getWorld().removeObject(getWorld().getObjects(Heart.class).get(0));
//}
}
}