diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java index 817dfa3c1412d5374f1e4cfdf272c269198a16a7..bef84a816b3c73ea4f2e6e6c5ca181a66dbdd740 100755 --- a/src/main/java/com/comandante/creeper/player/Player.java +++ b/src/main/java/com/comandante/creeper/player/Player.java @@ -937,9 +937,10 @@ public class Player extends CreeperEntity { npcStatsChangeBuilder.setStats(new StatsBuilder().setCurrentHealth(-(damageToVictim*3)).createStats()); npcStatsChangeBuilder.setDamageStrings(Arrays.asList(fightMsg)); } else { - final String fightMsg = Color.BOLD_ON + Color.RED + "[attack] " + Color.RESET + Color.YELLOW + "+" + NumberFormat.getNumberInstance(Locale.US).format(damageToVictim) + Color.RESET + Color.BOLD_ON + Color.RED + " DAMAGE" + Color.RESET + " done to " + npc.getColorName(); - npcStatsChangeBuilder.setStats(new StatsBuilder().setCurrentHealth(-damageToVictim).createStats()); - npcStatsChangeBuilder.setDamageStrings(Arrays.asList(fightMsg)); + final String fightMsg = Color.BOLD_ON + Color.RED + "[attack] " + Color.RESET + Color.YELLOW + "+" + NumberFormat.getNumberInstance(Locale.US).format(damageToVictim) + Color.RESET + Color.BOLD_ON + Color.RED + " DAMAGE" + Color.RESET + " done to " + npc.getColorName(); + npcStatsChangeBuilder.setStats(new StatsBuilder().setCurrentHealth(-damageToVictim).createStats()); + npcStatsChangeBuilder.setDamageStrings(Arrays.asList(fightMsg)); + } } else { final String fightMsg = Color.BOLD_ON + Color.RED + "[attack] " + Color.RESET + "You MISS " + npc.getName() + "!"; npcStatsChangeBuilder.setStats(new StatsBuilder().setCurrentHealth(-damageToVictim).createStats()); diff --git a/src/main/java/com/comandante/creeper/spells/HealingSpell.java b/src/main/java/com/comandante/creeper/spells/HealingSpell.java index b785f92508dc7128e3337d6cbeb8343e6de7a98c..f31b6ce8f6ab961b68a6a4cc6c8c083097393e4e 100644 --- a/src/main/java/com/comandante/creeper/spells/HealingSpell.java +++ b/src/main/java/com/comandante/creeper/spells/HealingSpell.java @@ -29,23 +29,22 @@ public class HealingSpell extends Spell { private static int manaCost = 80000000; private final static int coolDownTicks = 20; - private static EffectBuilder burnEffect = new EffectBuilder() + private static EffectBuilder fullHealEffect = new EffectBuilder() .setEffectApplyMessages(Lists.newArrayList("An aura of " + Color.BOLD_ON + Color.MAGENTA + "healing" + Color.RESET + " surrounds you")) .setEffectDescription("Heals a target to full health.") .setEffectName(Color.BOLD_ON + Color.MAGENTA + "healing" + Color.RESET + Color.BOLD_ON + Color.YELLOW + " AURA" + Color.RESET) .setDurationStats(new StatsBuilder().createStats()) - .setApplyStatsOnTick(new StatsBuilder().setCurrentHealth(stats.getMaxHealth).createStats()) .setFrozenMovement(false) .setLifeSpanTicks(1); public HealingSpell(GameManager gameManager) { - super(gameManager, validTriggers, manaCost, attackStats, attackMessages, DESCRIPTION, NAME, Sets.newHashSet(burnEffect.createEffect()), isAreaSpell, null, coolDownTicks); + super(gameManager, validTriggers, manaCost, attackStats, attackMessages, DESCRIPTION, NAME, Sets.newHashSet(fullHealEffect.createEffect()), isAreaSpell, null, coolDownTicks); } @Override public void attackSpell(Player destinationPlayer, Player sourcePlayer) { Stats stats = sourcePlayer.getPlayerStatsWithEquipmentAndLevel(); - this.setEffects(Sets.newHashSet(burnEffect.setApplyStatsOnTick(new StatsBuilder().setCurrentHealth((stats.getMaxHealth).createStats()).createEffect())); + this.setEffects(Sets.newHashSet(fullHealEffect.setApplyStatsOnTick(new StatsBuilder().setCurrentHealth((stats.getMaxHealth())).createStats()).createEffect())); super.attackSpell(destinationPlayer, sourcePlayer); } }