Adjusts the health and hunger to always show under wither, poison, and hunger.

This commit is contained in:
Markil3
2021-03-02 10:34:03 -07:00
parent 1c26eec9a4
commit ea626c9913

View File

@@ -758,7 +758,7 @@ public class TimerUtils
* Only makes a change if the player is healthy. Otherwise, * Only makes a change if the player is healthy. Otherwise,
* the bar is shown. * the bar is shown.
*/ */
if (health / maxHealth > HEALTH_BOUNDARY) if (health / maxHealth > HEALTH_BOUNDARY && !mc.player.isPotionActive(Effects.WITHER) && !mc.player.isPotionActive(Effects.POISON))
{ {
if (healthTime > 0) if (healthTime > 0)
{ {
@@ -828,22 +828,27 @@ public class TimerUtils
* Only fade a change if the player is satisfied. Otherwise, * Only fade a change if the player is satisfied. Otherwise,
* the bar is shown. * the bar is shown.
*/ */
if (hungerTime <= 0 && hunger > HUNGER_BOUNDARY) if (hunger > HUNGER_BOUNDARY && !mc.player.isPotionActive(Effects.HUNGER))
{ {
if (hungerTime > 0)
{
setAlpha(Main.getAlpha(hungerTime,
hungerTimes.getMaxTime(),
hungerTimes.getFadeInTime(),
hungerTimes.getFadeOutTime()));
stack.push();
stack.translate(0F,
getHealthTranslation(),
0F);
return false;
}
return true; return true;
} }
else stack.push();
{ stack.translate(0F,
setAlpha(Main.getAlpha(hungerTime, getHealthTranslation(),
hungerTimes.getMaxTime(), 0F);
hungerTimes.getFadeInTime(), return false;
hungerTimes.getFadeOutTime()));
stack.push();
stack.translate(0F,
getHealthTranslation(),
0F);
return false;
}
} }
/** /**