Fix for Player's Health being too large

Fix builds and deployment
A5H73Y · Jan 4, 2021 · 5075933 · 5075933
1 parent a3611f8
commit 5075933
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,7 @@ sudo: false
 language: java
 dist: trusty
 jdk:
-  - oraclejdk9
   - oraclejdk11
-  - openjdk8
-  - openjdk10
   - openjdk11
 notifications:
   email: false
@@ -20,6 +17,7 @@ before_deploy:
 deploy:
   provider: releases
   github_token: $PAT
-  file: "target/Parkour.jar"
+  file: "target/Parkour-*.jar"
+  file_glob: true
   skip_cleanup: true
   api_key: $PAT
diff --git a/src/main/java/io/github/a5h73y/parkour/type/player/PlayerManager.java b/src/main/java/io/github/a5h73y/parkour/type/player/PlayerManager.java
@@ -1486,9 +1486,7 @@ private void announceCourseFinishMessage(Player player, ParkourSession session)
 	 */
 	private void restoreHealthHunger(Player player) {
 		double health = PlayerInfo.getSavedHealth(player);
-		if (health <= 0) {
-			health = player.getMaxHealth();
-		}
+		health = Math.min(Math.max(0, health), player.getMaxHealth());
 		player.setHealth(health);
 		player.setFoodLevel(PlayerInfo.getSavedFoodLevel(player));
 		PlayerInfo.resetSavedHealthFoodLevel(player);