Upstream
/
MobArena
mirror of https://github.com/garbagemule/MobArena.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use GENERIC_MAX_HEALTH in MASpawnThread. 

setMaxHealth() and getMaxHealth() are deprecated.

Partial fix for #406
This commit is contained in:
Andreas Troelsen 2019-07-21 23:45:50 +02:00
parent d633583f9e
commit 0009e6363a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/garbagemule/MobArena/MASpawnThread.java
View File

@ -19,6 +19,7 @@ import com.garbagemule.MobArena.waves.types.UpgradeWave;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@ -227,10 +228,9 @@ public class MASpawnThread implements Runnable
monsterManager.addMonster(e);
// Set the health.
e.resetMaxHealth(); // Avoid conflicts/enormous multiplications from other plugins handling Mob health
int health = (int) Math.max(1D, e.getMaxHealth() * mul);
int health = (int) Math.max(1D, e.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() * mul);
try {
e.setMaxHealth(health);
e.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(health);
e.setHealth(health);
} catch (IllegalArgumentException ex) {
// Spigot... *facepalm*
@ -263,9 +263,9 @@ public class MASpawnThread implements Runnable
}
break;
case SWARM:
health = (int) (mul < 1D ? e.getMaxHealth() * mul : 1);
health = (int) (mul < 1D ? e.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() * mul : 1);
health = Math.max(1, health);
e.setHealth(Math.min(health, e.getMaxHealth()));
e.setHealth(Math.min(health, e.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()));
break;
case SUPPLY:
SupplyWave sw = (SupplyWave) w;