From dbc57060ee99405d629cdae9278fcb57d673eca2 Mon Sep 17 00:00:00 2001 From: bm01 Date: Tue, 1 May 2012 23:49:11 +0200 Subject: [PATCH] Reduced bleeding ticks damage --- Changelog.txt | 1 + .../java/com/gmail/nossr50/runnables/BleedTimer.java | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index be6431909..b2352cd37 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -21,6 +21,7 @@ Version 1.3.07 = Fixed bug where the permission node for Impact didn't work = Fixed some bypass nodes defaulting true for Ops = Fixed bug with trying to use Chimera Wing while standing on a half-block + ! Changed bleeding ticks damage to 1 from 2 ! Changed Mining to ignore blocks when the pick is enchanted with Silk Touch ! Changed Super Breaker to be non-functional when used with a Silk Touch enchanted pick ! Changed MySQL to save player information 50ms apart from each other to reduce the load on the MySQL server diff --git a/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java b/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java index a2c151759..f5c27d27b 100644 --- a/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java +++ b/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java @@ -48,13 +48,8 @@ public class BleedTimer implements Runnable { } //Never kill with Bleeding - if (player.getHealth() - 2 < 0) { - if (player.getHealth() - 1 > 0) { - Combat.dealDamage(player, 1); - } - } - else { - Combat.dealDamage(player, 2); + if (player.getHealth() - 1 > 0) { + Combat.dealDamage(player, 1); } entry.setValue(entry.getValue() - 1);