From 742ff1eafca32a30180a5f4a32f8d3048741b3e2 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 9 Dec 2014 11:01:43 +0100
Subject: [PATCH] Bugfix: Shield makes player get remaining damage as hp.

---
 src/de/teamteamteam/spacescooter/entity/LivingEntity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
index 048cf4b..7d0b3fd 100644
--- a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
+++ b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
@@ -104,7 +104,7 @@ public abstract class LivingEntity extends CollidableEntity implements Hittable
 			return;
 		if (this.shieldPoints > 0) {
 			if (this.shieldPoints < damage) {
-				this.healthPoints = (damage - this.shieldPoints);
+				this.healthPoints -= (damage - this.shieldPoints);
 				this.shieldPoints = 0;
 			} else {
 				this.shieldPoints -= damage;