Do not update health mid-morph if player dies. Closes iChun#541

scornsaber · Jul 17, 2014 · 472917d · 472917d
1 parent 97fdb00
commit 472917d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/morph/client/core/TickHandlerClient.java b/src/main/java/morph/client/core/TickHandlerClient.java
@@ -783,7 +783,10 @@ else if(info.prevState != null && info.player != null)
                                 if(nextMaxHealth != info.player.getEntityAttribute(SharedMonsterAttributes.maxHealth).getBaseValue())
                                 {
                                     info.player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(nextMaxHealth);
-                                    info.player.setHealth((float)nextMaxHealth);
+                                    if(info.player.getHealth() < nextMaxHealth)
+                                    {
+                                        info.player.setHealth((float)nextMaxHealth);
+                                    }
                                 }
                             }
 

diff --git a/src/main/java/morph/common/core/TickHandlerServer.java b/src/main/java/morph/common/core/TickHandlerServer.java
@@ -206,7 +206,7 @@ else if(info.prevState != null && player != null)
                                 {
                                     targetHealth = 1.0F;
                                 }
-                                if(nextMaxHealth > prevMaxHealth && player.getHealth() + 0.5F < (float)Math.floor(targetHealth) || prevMaxHealth > nextMaxHealth)
+                                if((nextMaxHealth > prevMaxHealth && player.getHealth() + 0.5F < (float)Math.floor(targetHealth) || prevMaxHealth > nextMaxHealth) && player.isEntityAlive())
                                 {
                                     player.setHealth(targetHealth);
                                 }