From 7766260154cbbee0a002fce21a2a074369136ac5 Mon Sep 17 00:00:00 2001 From: garbagemule Date: Fri, 1 Aug 2014 20:01:52 +0200 Subject: [PATCH] Switch boss health from ints to doubles - fixes "Health must be between" bugs for bosses. --- src/com/garbagemule/MobArena/MASpawnThread.java | 2 +- src/com/garbagemule/MobArena/MonsterManager.java | 2 +- src/com/garbagemule/MobArena/waves/MABoss.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/garbagemule/MobArena/MASpawnThread.java b/src/com/garbagemule/MobArena/MASpawnThread.java index 4812552..42f7b67 100644 --- a/src/com/garbagemule/MobArena/MASpawnThread.java +++ b/src/com/garbagemule/MobArena/MASpawnThread.java @@ -177,7 +177,7 @@ public class MASpawnThread implements Runnable switch (w.getType()){ case BOSS: BossWave bw = (BossWave) w; - int maxHealth = bw.getMaxHealth(playerCount); + double maxHealth = bw.getMaxHealth(playerCount); MABoss boss = monsterManager.addBoss(e, maxHealth); boss.setReward(bw.getReward()); bw.addMABoss(boss); diff --git a/src/com/garbagemule/MobArena/MonsterManager.java b/src/com/garbagemule/MobArena/MonsterManager.java index e3a0c41..2d36412 100644 --- a/src/com/garbagemule/MobArena/MonsterManager.java +++ b/src/com/garbagemule/MobArena/MonsterManager.java @@ -160,7 +160,7 @@ public class MonsterManager return suppliers.get(e); } - public MABoss addBoss(LivingEntity e, int maxHealth) { + public MABoss addBoss(LivingEntity e, double maxHealth) { MABoss b = new MABoss(e, maxHealth); bosses.put(e, b); return b; diff --git a/src/com/garbagemule/MobArena/waves/MABoss.java b/src/com/garbagemule/MobArena/waves/MABoss.java index 207580e..cd16a33 100644 --- a/src/com/garbagemule/MobArena/waves/MABoss.java +++ b/src/com/garbagemule/MobArena/waves/MABoss.java @@ -14,7 +14,7 @@ public class MABoss * @param entity an entity * @param maxHealth a max health value */ - public MABoss(LivingEntity entity, int maxHealth) { + public MABoss(LivingEntity entity, double maxHealth) { entity.setMaxHealth(maxHealth); entity.setHealth(maxHealth); this.entity = entity;