diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Explosion.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Explosion.java index af59cd05bd80e0c761a63a08740054c2cdf4982d..134b914474930c6ee01cd5dd6682f50a0ee054a6 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Explosion.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Explosion.java @@ -121,4 +121,9 @@ public class Explosion implements IEntity { return 0; } + @Override + public int getMaxEntityHealth() { + return 0; + } + } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java index 4683324cc238be09dddfd608cae4962a85c4e0d6..475cb915fc7f3de25a72d75e0da8c9c1540752c2 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java @@ -151,4 +151,9 @@ public class Bomb implements IEntity { return 0; } + @Override + public int getMaxEntityHealth() { + return 0; + } + } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java index ab8d029d40f1622ee9e681355fc4cc96cf38cece..7e44e97dbe7528d1974696ea41029d74ff4beff8 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java @@ -129,4 +129,9 @@ public class Heart implements IEntity { return 0; } + @Override + public int getMaxEntityHealth() { + return 0; + } + } \ No newline at end of file diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java index 00744dbfdd549dbe7e1b6cf3c19f5b05b40e41b0..e3f23e49e63bde57e34fd7f49d1e94ac96a67167 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java @@ -45,4 +45,5 @@ public interface IEntity { void setObjectStatus(ObjectStatus objectStatus); int getHealth(); + int getMaxEntityHealth(); } \ No newline at end of file diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java index 0a0be87598b38760c053645b18ca6683dfc434bf..6451477a54d9be77ca8daff6ad57b696d8db72fc 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java @@ -118,6 +118,11 @@ class NetworkPlayerTwo implements IEntity{ @Override public int getHealth() { + return health; + } + + @Override + public int getMaxEntityHealth() { return 0; } 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 4decc3eda180cea1bad2475b548e58e9893ca70b..2805f0418f3578eb65494db177bbfbfbf4d5fc05 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 @@ -578,4 +578,11 @@ class Player implements IEntity { public int getHealth() { return health; } + + @Override + public int getMaxEntityHealth() { + return maxPlayerHealth; + } + + } \ No newline at end of file