diff --git a/.idea/misc.xml b/.idea/misc.xml index 2ccb0eff215f5c6ab99e0ddd5631d2c98505207e..fc45e5d1ccd129776fae9a28db0af25398ca6ad2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,9 +7,8 @@ <option value="$PROJECT_DIR$/pom.xml" /> </list> </option> - <option name="workspaceImportForciblyTurnedOn" value="true" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="21" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="21" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project> \ No newline at end of file diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java index bc86e90a475a9a6adbb2201ee554a3b6f69d0f42..34573a729ec9056e172553f7b589abfb2a07cca8 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java @@ -586,7 +586,14 @@ class Player implements IEntity { @Override public void gotHit(int damageDone) { - health -= damageDone; + int damagedHealth = health - damageDone; + if(damagedHealth > 0){ + health -= damageDone; + }else{ + health = 0; + log.info("Dead"); + } + log.info("DamageTaken current Health: " + health); } @Override