From 2ce02c9169e42e129b3dceec53d7265fb6195177 Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Tue, 13 Sep 2011 23:34:20 +0200 Subject: [PATCH] Hotfix for health-multiplier --- MobArena.jar | Bin 246857 -> 246846 bytes .../MobArena/waves/AbstractWave.java | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index f0296d049674927993d61455d3dea4fc153ac774..19d2e7104bcd778509acc212a23a4b8364d53255 100644 GIT binary patch delta 7050 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 delta 6792 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 L!l)aAErs-d1U*e2 diff --git a/src/com/garbagemule/MobArena/waves/AbstractWave.java b/src/com/garbagemule/MobArena/waves/AbstractWave.java index 6577a59..434a129 100644 --- a/src/com/garbagemule/MobArena/waves/AbstractWave.java +++ b/src/com/garbagemule/MobArena/waves/AbstractWave.java @@ -89,8 +89,8 @@ public abstract class AbstractWave implements Wave getArena().addMonster(e); // Boost health - if (getHealthMultiplier() > 1) - e.setHealth((int) Math.min(150D, e.getHealth() * getHealthMultiplier())); + int health = (int) Math.min(150D, e.getHealth() * healthMultiplier); + e.setHealth(Math.min(1, health)); // Grab a random target. if (e instanceof Creature) @@ -119,8 +119,7 @@ public abstract class AbstractWave implements Wave { for (int i = 0; i < entry.getValue(); i++) { - LivingEntity e = spawnMonster(entry.getKey(), spawnpoints.get(index % spawnpointCount)); - e.setHealth((int) Math.min(150D, e.getHealth() * healthMultiplier)); + spawnMonster(entry.getKey(), spawnpoints.get(index % spawnpointCount)); index++; } }