From be79c8fdb0cd808a24fe5add858f08cd3c9071f1 Mon Sep 17 00:00:00 2001
From: Scherbaum Maximilian <ms622@hdm-stuttgart.de>
Date: Sat, 27 Jan 2024 16:17:51 +0100
Subject: [PATCH] fix: missing getter in player class
---
.../hdm_stuttgart/battlearena/Model/Entity/Explosion.java | 5 +++++
.../battlearena/Model/Entity/GameplayObjects/Bomb.java | 5 +++++
.../battlearena/Model/Entity/GameplayObjects/Heart.java | 5 +++++
.../de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java | 1 +
.../battlearena/Model/Entity/NetworkPlayerTwo.java | 5 +++++
.../de/hdm_stuttgart/battlearena/Model/Entity/Player.java | 7 +++++++
6 files changed, 28 insertions(+)
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 af59cd05..134b9144 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 4683324c..475cb915 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 ab8d029d..7e44e97d 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 00744dbf..e3f23e49 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 0a0be875..6451477a 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 4decc3ed..2805f041 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
--
GitLab